Bump Buildroot to 2021.02-rc3 (#1260)
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
This commit is contained in:
@@ -15,7 +15,7 @@ choice
|
||||
Select the specific ATF version you want to use
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
|
||||
bool "v2.2"
|
||||
bool "v2.4"
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@@ -43,7 +43,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
|
||||
string
|
||||
default "v2.2" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
|
||||
default "v2.4" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
|
||||
default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
|
||||
default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \
|
||||
if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 07e3c058ae2d95c7d516a46fc93565b797e912c3271ddbf29df523b1ab1ee911 arm-trusted-firmware-v2.2.tar.gz
|
||||
sha256 4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d arm-trusted-firmware-v2.4.tar.gz
|
||||
sha256 487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164 license.rst
|
||||
|
||||
@@ -24,6 +24,9 @@ ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y)
|
||||
AT91BOOTSTRAP3_LICENSE_FILES = main.c
|
||||
endif
|
||||
|
||||
AT91BOOTSTRAP3_CPE_ID_VENDOR = linux4sam
|
||||
AT91BOOTSTRAP3_CPE_ID_PRODUCT = at91bootstrap
|
||||
|
||||
AT91BOOTSTRAP3_INSTALL_IMAGES = YES
|
||||
AT91BOOTSTRAP3_INSTALL_TARGET = NO
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ choice
|
||||
Select the specific Barebox version you want to use
|
||||
|
||||
config BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
bool "2020.09.0"
|
||||
bool "2020.11.0"
|
||||
|
||||
config BR2_TARGET_BAREBOX_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@@ -40,7 +40,7 @@ endif
|
||||
|
||||
config BR2_TARGET_BAREBOX_VERSION
|
||||
string
|
||||
default "2020.09.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
default "2020.11.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
|
||||
default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
|
||||
default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# From https://www.barebox.org/download/barebox-2020.09.0.tar.bz2.md5
|
||||
md5 907dc813298fcded06fa9c788d3fb6c8 barebox-2020.09.0.tar.bz2
|
||||
# From https://www.barebox.org/download/barebox-2020.11.0.tar.bz2.md5
|
||||
md5 1fc2c1a03d7b44dc12fbf4cf1fc6ffe0 barebox-2020.11.0.tar.bz2
|
||||
|
||||
# Locally calculated
|
||||
sha256 aad3b0736aa8d368d185736260d81fb3785251f376897be3cec745182fd51869 barebox-2020.09.0.tar.bz2
|
||||
sha256 049d2b1b887d0397f4b5390255459fb0240200b06a3276ffaefdeab7fb243554 barebox-2020.11.0.tar.bz2
|
||||
|
||||
# License files, locally computed
|
||||
sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING
|
||||
|
||||
@@ -28,7 +28,7 @@ $(1)_SITE_METHOD = git
|
||||
# Override the default value of _SOURCE to 'barebox-*' so that it is not
|
||||
# downloaded a second time for barebox-aux; also alows avoiding the hash
|
||||
# check:
|
||||
$(1)_SOURCE = barebox-$$($(1)_VERSION).tar.gz
|
||||
$(1)_SOURCE = barebox-$$($(1)_VERSION)$$(BR_FMT_VERSION_git).tar.gz
|
||||
else
|
||||
# Handle stable official Barebox versions
|
||||
$(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BOOT_WRAPPER_AARCH64_VERSION = fd74c8cbd0e17483d2299208cad9742bee605ca7
|
||||
BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a
|
||||
BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
|
||||
BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause
|
||||
BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
|
||||
|
||||
@@ -37,6 +37,7 @@ GRUB2_INSTALL_TARGET = YES
|
||||
else
|
||||
GRUB2_INSTALL_TARGET = NO
|
||||
endif
|
||||
GRUB2_CPE_ID_VENDOR = gnu
|
||||
|
||||
GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES))
|
||||
GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG))
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From 5867fcad6e88af3d843bfa831648d84a53732d57 Mon Sep 17 00:00:00 2001
|
||||
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Date: Wed, 19 Dec 2018 17:17:13 +0100
|
||||
Subject: [PATCH] mv_ddr: mv_ddr4_training_leveling.c: uninitialized variable
|
||||
|
||||
With GCC 8.2 uninitialized variables lead to a build error.
|
||||
|
||||
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit 5867fcad6e8
|
||||
|
||||
mv_ddr4_training_leveling.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mv_ddr4_training_leveling.c b/mv_ddr4_training_leveling.c
|
||||
index 144e21a03c01..cb95389f5466 100644
|
||||
--- a/mv_ddr4_training_leveling.c
|
||||
+++ b/mv_ddr4_training_leveling.c
|
||||
@@ -368,7 +368,7 @@ static int mv_ddr4_dynamic_pb_wl_supp(u32 dev_num, enum mv_wl_supp_mode ecc_mode
|
||||
u32 subphy_num = ddr3_tip_dev_attr_get(dev_num, MV_ATTR_OCTET_PER_INTERFACE);
|
||||
u8 compare_result = 0;
|
||||
u32 orig_phase;
|
||||
- u32 rd_data, wr_data;
|
||||
+ u32 rd_data, wr_data = 0;
|
||||
u32 flag, step;
|
||||
struct mv_ddr_topology_map *tm = mv_ddr_topology_map_get();
|
||||
u32 ecc_phy_access_id;
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 39dcc8baccb82cbc746d8f82ce7f673e1b1236e8aee0d09e7ab12c27eeb6ecda mv-ddr-marvell-618dadd1491eb2f7b2fd74313c04f7accddae475.tar.gz
|
||||
sha256 bfab74a625d65238c569b9df282b55c0fc9a1e2d3decedcf194d44774df2ede4 mv-ddr-marvell-305d923e6bc4236cd3b902f6679b0aef9e5fa52d.tar.gz
|
||||
sha256 69208236fc322026920b92d1d839ebdc521ca65379bfdb3368a24945e794fc78 ddr3_init.c
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
# This is the commit for mv_ddr-armada-18.12.0
|
||||
MV_DDR_MARVELL_VERSION = 618dadd1491eb2f7b2fd74313c04f7accddae475
|
||||
# This is the latest commit on mv-ddr-devel as of 20201207
|
||||
MV_DDR_MARVELL_VERSION = 305d923e6bc4236cd3b902f6679b0aef9e5fa52d
|
||||
MV_DDR_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,mv-ddr-marvell,$(MV_DDR_MARVELL_VERSION))
|
||||
MV_DDR_MARVELL_LICENSE = GPL-2.0+ or LGPL-2.1 with freertos-exception-2.0, BSD-3-Clause, Marvell Commercial
|
||||
MV_DDR_MARVELL_LICENSE_FILES = ddr3_init.c
|
||||
|
||||
@@ -8,6 +8,7 @@ SHIM_VERSION = 15
|
||||
SHIM_SITE = $(call github,rhboot,shim,$(SHIM_VERSION))
|
||||
SHIM_LICENSE = BSD-2-Clause
|
||||
SHIM_LICENSE_FILES = COPYRIGHT
|
||||
SHIM_CPE_ID_VENDOR = redhat
|
||||
SHIM_DEPENDENCIES = gnu-efi
|
||||
SHIM_INSTALL_TARGET = NO
|
||||
SHIM_INSTALL_IMAGES = YES
|
||||
|
||||
@@ -41,7 +41,7 @@ choice
|
||||
Select the specific U-Boot version you want to use
|
||||
|
||||
config BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
bool "2020.10"
|
||||
bool "2021.01"
|
||||
|
||||
config BR2_TARGET_UBOOT_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@@ -85,7 +85,7 @@ endif
|
||||
|
||||
config BR2_TARGET_UBOOT_VERSION
|
||||
string
|
||||
default "2020.10" if BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
default "2021.01" if BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
|
||||
if BR2_TARGET_UBOOT_CUSTOM_VERSION
|
||||
default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
|
||||
@@ -229,6 +229,16 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_TARGET_UBOOT_NEEDS_OPENSBI
|
||||
bool "U-Boot needs OpenSBI"
|
||||
depends on BR2_TARGET_OPENSBI
|
||||
help
|
||||
Some RISC-V platforms (such as SiFive HiFive Unleashed)
|
||||
encapsulate the OpenSBI firmware image inside U-Boot.
|
||||
This option makes sure OpenSBI gets built prior to U-Boot,
|
||||
and that the OpenSBI variable pointing to OpenSBI binary,
|
||||
is passed during the Buildroot build.
|
||||
|
||||
menu "U-Boot binary format"
|
||||
|
||||
config BR2_TARGET_UBOOT_FORMAT_AIS
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622 u-boot-2020.10.tar.bz2
|
||||
sha256 b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454 u-boot-2021.01.tar.bz2
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt
|
||||
|
||||
@@ -11,6 +11,8 @@ UBOOT_LICENSE = GPL-2.0+
|
||||
ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),y)
|
||||
UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt
|
||||
endif
|
||||
UBOOT_CPE_ID_VENDOR = denx
|
||||
UBOOT_CPE_ID_PRODUCT = u-boot
|
||||
|
||||
UBOOT_INSTALL_IMAGES = YES
|
||||
|
||||
@@ -161,14 +163,19 @@ UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.bin
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y)
|
||||
UBOOT_DEPENDENCIES += opensbi
|
||||
UBOOT_MAKE_OPTS += OPENSBI=$(BINARIES_DIR)/fw_dynamic.bin
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
|
||||
UBOOT_DEPENDENCIES += host-dtc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y)
|
||||
UBOOT_DEPENDENCIES += host-python
|
||||
UBOOT_DEPENDENCIES += host-python host-python-setuptools
|
||||
else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
|
||||
UBOOT_DEPENDENCIES += host-python3
|
||||
UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y)
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 def599c86ab3606f7f67c0190e9b237fbc0cf934a951ffb1c5fb0c47d8a8f3d2 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3.tar.gz
|
||||
sha256 ea92d686e6e211074fb0f62cb5e011f4cfc294c7f6ec9fb27b7d987db7bf51c5 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3-br1.tar.gz
|
||||
|
||||
Reference in New Issue
Block a user