diff options
Diffstat (limited to 'boot')
24 files changed, 117 insertions, 509 deletions
diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index e505dee9d0..c06294040e 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.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 diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 3cd83d78f2..970613f38d 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -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 diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index a3553e36cf..0597cecf71 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -100,6 +100,14 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += MV_DDR_PATH=$(MV_DDR_MARVELL_DIR) ARM_TRUSTED_FIRMWARE_DEPENDENCIES += mv-ddr-marvell endif +ifeq ($(BR2_SSP_REGULAR),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=default +else ifeq ($(BR2_SSP_STRONG),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=strong +else ifeq ($(BR2_SSP_ALL),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=all +endif + ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y) diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk index 5cf865c681..a942afcdc9 100644 --- a/boot/at91bootstrap3/at91bootstrap3.mk +++ b/boot/at91bootstrap3/at91bootstrap3.mk @@ -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 diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 9948a249a0..239c95bf90 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2020.08.1" + 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.08.1" 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 diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 4bccdf9e03..3644601bbc 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ -# From https://www.barebox.org/download/barebox-2020.08.1.tar.bz2.md5 -md5 d57031878390cb267f6641aedffcda9f barebox-2020.08.1.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 8e6d413f1083ae0974b11a381369a3bac83e798a99830a1de128c950fef047e6 barebox-2020.08.1.tar.bz2 +sha256 049d2b1b887d0397f4b5390255459fb0240200b06a3276ffaefdeab7fb243554 barebox-2020.11.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 422f27312d..8f02f9f9e1 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -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 @@ -88,13 +88,6 @@ $(1)_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) -ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) -define $(1)_BUILD_BAREBOXENV_CMDS - $$(TARGET_CC) $$(TARGET_CFLAGS) $$(TARGET_LDFLAGS) -o $$(@D)/bareboxenv \ - $$(@D)/scripts/bareboxenv.c -endef -endif - ifeq ($$(BR2_TARGET_$(1)_CUSTOM_ENV),y) $(1)_ENV_NAME = $$(notdir $$(call qstrip,\ $$(BR2_TARGET_$(1)_CUSTOM_ENV_PATH))) @@ -109,12 +102,23 @@ endef endif ifneq ($$($(1)_CUSTOM_EMBEDDED_ENV_PATH),) -define $(1)_KCONFIG_FIXUP_CMDS +define $(1)_KCONFIG_FIXUP_CUSTOM_EMBEDDED_ENV_PATH $$(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_ENVIRONMENT) $$(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENVIRONMENT_PATH,"$$($(1)_CUSTOM_EMBEDDED_ENV_PATH)") endef endif +define $(1)_KCONFIG_FIXUP_BAREBOXENV + $$(if $$(BR2_TARGET_$(1)_BAREBOXENV),\ + $$(call KCONFIG_ENABLE_OPT,CONFIG_BAREBOXENV_TARGET),\ + $$(call KCONFIG_DISABLE_OPT,CONFIG_BAREBOXENV_TARGET)) +endef + +define $(1)_KCONFIG_FIXUP_CMDS + $$($(1)_KCONFIG_FIXUP_CUSTOM_EMBEDDED_ENV_PATH) + $$($(1)_KCONFIG_FIXUP_BAREBOXENV) +endef + define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) @@ -134,9 +138,14 @@ define $(1)_INSTALL_IMAGES_CMDS $$($(1)_INSTALL_CUSTOM_ENV) endef +# Starting with barebox v2020.09.0, the kconfig used calls the +# cross-compiler to check its capabilities. So we need the +# toolchain before we can call the configurators. +$(1)_KCONFIG_DEPENDENCIES += toolchain + ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) define $(1)_INSTALL_TARGET_CMDS - cp $$(@D)/bareboxenv $$(TARGET_DIR)/usr/bin + cp $$(@D)/scripts/bareboxenv-target $$(TARGET_DIR)/usr/bin/bareboxenv endef endif diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 117e113984..3a1af9b02c 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -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 diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 5fca2315ee..9686815f4d 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -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)) diff --git a/boot/lpc32xxcdl/lpc32xxcdl.hash b/boot/lpc32xxcdl/lpc32xxcdl.hash new file mode 100644 index 0000000000..8c6b73d63f --- /dev/null +++ b/boot/lpc32xxcdl/lpc32xxcdl.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 ded3fa936a96d3fb8188ca6214f57b5208bd49e5416bd69f38bfc810b34197bc lpc32xx_cdl-v2.11.zip diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk index 30afed050b..9f5cd27f50 100644 --- a/boot/lpc32xxcdl/lpc32xxcdl.mk +++ b/boot/lpc32xxcdl/lpc32xxcdl.mk @@ -4,9 +4,9 @@ # ################################################################################ -LPC32XXCDL_VERSION = lpc32xx_cdl_v2.11 -LPC32XXCDL_SITE = http://git.lpcware.com/lpc3xxx_cdl.git -LPC32XXCDL_SITE_METHOD = git +LPC32XXCDL_VERSION = 2.11 +LPC32XXCDL_SOURCE = lpc32xx_cdl-v$(LPC32XXCDL_VERSION).zip +LPC32XXCDL_SITE = https://community.nxp.com/pwmxy87654/attachments/pwmxy87654/lpcware-archive/61/2 LPC32XXCDL_INSTALL_TARGET = NO LPC32XXCDL_INSTALL_IMAGES = YES @@ -45,13 +45,14 @@ LPC32XXCDL_BOARD_STARTUP_DIR = \ # Source files are with dos newlines, which our patch infrastructure doesn't # handle. Work around it by converting the affected files to unix newlines # before patching -define LPC32XXCDL_DOS2UNIX_FOR_PATCH +define LPC32XXCDL_EXTRACT_CMDS + unzip $(LPC32XXCDL_DL_DIR)/$(LPC32XXCDL_SOURCE) -d $(@D) + mv $(@D)/lpc3xxx_cdl/* $(@D) + rmdir $(@D)/lpc3xxx_cdl/ sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \ boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//' endef -LPC32XXCDL_POST_EXTRACT_HOOKS += LPC32XXCDL_DOS2UNIX_FOR_PATCH - define LPC32XXCDL_BUILD_CMDS $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D) $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER) diff --git a/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch b/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch deleted file mode 100644 index eada18b473..0000000000 --- a/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch +++ /dev/null @@ -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 - diff --git a/boot/mv-ddr-marvell/mv-ddr-marvell.hash b/boot/mv-ddr-marvell/mv-ddr-marvell.hash index ec2fe6ed37..e1a86008db 100644 --- a/boot/mv-ddr-marvell/mv-ddr-marvell.hash +++ b/boot/mv-ddr-marvell/mv-ddr-marvell.hash @@ -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 diff --git a/boot/mv-ddr-marvell/mv-ddr-marvell.mk b/boot/mv-ddr-marvell/mv-ddr-marvell.mk index a4e0c0467d..442b6aed53 100644 --- a/boot/mv-ddr-marvell/mv-ddr-marvell.mk +++ b/boot/mv-ddr-marvell/mv-ddr-marvell.mk @@ -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 diff --git a/boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch b/boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch deleted file mode 100644 index 822ef4b39e..0000000000 --- a/boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 04a8def18caccad27292ba97dc8ea8b3eb3a6afd Mon Sep 17 00:00:00 2001 -From: Etienne Carriere <etienne.carriere@linaro.org> -Date: Tue, 26 May 2020 11:10:45 +0200 -Subject: [PATCH] scripts/pem_to_pub.py: use Cryptodome module instead of - Crypto - -Upgrade scripts/pem_to_pub.py to use module Cryptodome instead of -module Crypto for consistency with the other helper Python scripts -of OP-TEE OS package. - -Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> -Acked-by: Jens Wiklander <jens.wiklander@linaro.org> ---- - scripts/pem_to_pub_c.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/pem_to_pub_c.py b/scripts/pem_to_pub_c.py -index 3a896a393..d3f0e5006 100755 ---- a/scripts/pem_to_pub_c.py -+++ b/scripts/pem_to_pub_c.py -@@ -21,8 +21,8 @@ def get_args(): - - def main(): - import array -- from Crypto.PublicKey import RSA -- from Crypto.Util.number import long_to_bytes -+ from Cryptodome.PublicKey import RSA -+ from Cryptodome.Util.number import long_to_bytes - - args = get_args() - --- -2.17.1 - diff --git a/boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch b/boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch deleted file mode 100644 index 867836ef0c..0000000000 --- a/boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c5f5e6bf6644a536a0d53bfb9f5c5419150035dd Mon Sep 17 00:00:00 2001 -From: Jens Wiklander <jens.wiklander@linaro.org> -Date: Mon, 25 May 2020 12:20:08 +0200 -Subject: [PATCH] config.mk: fix CFG_OPTEE_REVISION_MINOR - -The current release is 3.9.0, change the revision to match. - -Fixes: af141c61fe7a ("Update CHANGELOG for 3.9.0") -Reviewed-by: Joakim Bech <joakim.bech@linaro.org> -Reported-by: Etienne Carriere <etienne.carriere@linaro.org> -Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> -Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> ---- - mk/config.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mk/config.mk b/mk/config.mk -index c00a14618..bc49f83d8 100644 ---- a/mk/config.mk -+++ b/mk/config.mk -@@ -116,7 +116,7 @@ endif - # with limited depth not including any tag, so there is really no guarantee - # that TEE_IMPL_VERSION contains the major and minor revision numbers. - CFG_OPTEE_REVISION_MAJOR ?= 3 --CFG_OPTEE_REVISION_MINOR ?= 8 -+CFG_OPTEE_REVISION_MINOR ?= 9 - - # Trusted OS implementation manufacturer name - CFG_TEE_MANUFACTURER ?= LINARO --- -2.17.1 - diff --git a/boot/optee-os/0003-mk-core-ta-Configurable-Python-interpreter.patch b/boot/optee-os/0003-mk-core-ta-Configurable-Python-interpreter.patch deleted file mode 100644 index 911a09b986..0000000000 --- a/boot/optee-os/0003-mk-core-ta-Configurable-Python-interpreter.patch +++ /dev/null @@ -1,249 +0,0 @@ -From 49c7d2557d92993a1e09e50c961b9d4f7ab1091b Mon Sep 17 00:00:00 2001 -From: Dick Olsson <hi@senzilla.io> -Date: Wed, 22 Jul 2020 08:49:12 +0200 -Subject: [PATCH] mk: core: ta: Configurable Python interpreter - -Build systems that manage multiple different python interpreters need -explicit control over which version of the interpreter to use. -This patch enables one to override the default interpreter with the path -to a specific one. - -Signed-off-by: Dick Olsson <hi@senzilla.io> -Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> -Reviewed-by: Jerome Forissier <jerome@forissier.org> ---- - core/arch/arm/arm.mk | 2 ++ - core/arch/arm/kernel/link.mk | 22 +++++++++++----------- - core/sub.mk | 10 +++++----- - mk/config.mk | 6 ++++++ - mk/lib.mk | 2 +- - ta/arch/arm/link.mk | 2 +- - ta/arch/arm/link_shlib.mk | 2 +- - ta/ta.mk | 2 +- - 8 files changed, 28 insertions(+), 20 deletions(-) - -diff --git a/core/arch/arm/arm.mk b/core/arch/arm/arm.mk -index 5c9f16ef..878035c5 100644 ---- a/core/arch/arm/arm.mk -+++ b/core/arch/arm/arm.mk -@@ -245,6 +245,7 @@ ta-mk-file-export-add-ta_arm32 += CROSS_COMPILE32 ?= $$(CROSS_COMPILE)_nl_ - ta-mk-file-export-add-ta_arm32 += CROSS_COMPILE_ta_arm32 ?= $$(CROSS_COMPILE32)_nl_ - ta-mk-file-export-add-ta_arm32 += COMPILER ?= gcc_nl_ - ta-mk-file-export-add-ta_arm32 += COMPILER_ta_arm32 ?= $$(COMPILER)_nl_ -+ta-mk-file-export-add-ta_arm32 += PYTHON3 ?= python3_nl_ - endif - - ifneq ($(filter ta_arm64,$(ta-targets)),) -@@ -275,6 +276,7 @@ ta-mk-file-export-add-ta_arm64 += CROSS_COMPILE64 ?= $$(CROSS_COMPILE)_nl_ - ta-mk-file-export-add-ta_arm64 += CROSS_COMPILE_ta_arm64 ?= $$(CROSS_COMPILE64)_nl_ - ta-mk-file-export-add-ta_arm64 += COMPILER ?= gcc_nl_ - ta-mk-file-export-add-ta_arm64 += COMPILER_ta_arm64 ?= $$(COMPILER)_nl_ -+ta-mk-file-export-add-ta_arm64 += PYTHON3 ?= python3_nl_ - endif - - # Set cross compiler prefix for each TA target -diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk -index 1b89b895..69375ad6 100644 ---- a/core/arch/arm/kernel/link.mk -+++ b/core/arch/arm/kernel/link.mk -@@ -62,13 +62,13 @@ cleanfiles += $(link-out-dir)/text_unpaged.ld.S - $(link-out-dir)/text_unpaged.ld.S: $(link-out-dir)/unpaged.o - @$(cmd-echo-silent) ' GEN $@' - $(q)$(READELFcore) -S -W $< | \ -- ./scripts/gen_ld_sects.py .text. > $@ -+ $(PYTHON3) ./scripts/gen_ld_sects.py .text. > $@ - - cleanfiles += $(link-out-dir)/rodata_unpaged.ld.S - $(link-out-dir)/rodata_unpaged.ld.S: $(link-out-dir)/unpaged.o - @$(cmd-echo-silent) ' GEN $@' - $(q)$(READELFcore) -S -W $< | \ -- ./scripts/gen_ld_sects.py .rodata. > $@ -+ $(PYTHON3) ./scripts/gen_ld_sects.py .rodata. > $@ - - - cleanfiles += $(link-out-dir)/init_entries.txt -@@ -92,12 +92,12 @@ cleanfiles += $(link-out-dir)/text_init.ld.S - $(link-out-dir)/text_init.ld.S: $(link-out-dir)/init.o - @$(cmd-echo-silent) ' GEN $@' - $(q)$(READELFcore) -S -W $< | \ -- ./scripts/gen_ld_sects.py .text. > $@ -+ $(PYTHON3) ./scripts/gen_ld_sects.py .text. > $@ - - cleanfiles += $(link-out-dir)/rodata_init.ld.S - $(link-out-dir)/rodata_init.ld.S: $(link-out-dir)/init.o - @$(cmd-echo-silent) ' GEN $@' -- $(q)$(READELFcore) -S -W $< | ./scripts/gen_ld_sects.py .rodata. > $@ -+ $(q)$(READELFcore) -S -W $< | $(PYTHON3) ./scripts/gen_ld_sects.py .rodata. > $@ - - -include $(link-script-dep) - -@@ -176,39 +176,39 @@ cleanfiles += $(link-out-dir)/tee-pager.bin - $(link-out-dir)/tee-pager.bin: $(link-out-dir)/tee.elf scripts/gen_tee_bin.py - @echo Warning: $@ is deprecated - @$(cmd-echo-silent) ' GEN $@' -- $(q)scripts/gen_tee_bin.py --input $< --out_tee_pager_bin $@ -+ $(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_tee_pager_bin $@ - - cleanfiles += $(link-out-dir)/tee-pageable.bin - $(link-out-dir)/tee-pageable.bin: $(link-out-dir)/tee.elf scripts/gen_tee_bin.py - @echo Warning: $@ is deprecated - @$(cmd-echo-silent) ' GEN $@' -- $(q)scripts/gen_tee_bin.py --input $< --out_tee_pageable_bin $@ -+ $(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_tee_pageable_bin $@ - - all: $(link-out-dir)/tee.bin - cleanfiles += $(link-out-dir)/tee.bin - $(link-out-dir)/tee.bin: $(link-out-dir)/tee.elf scripts/gen_tee_bin.py - @$(cmd-echo-silent) ' GEN $@' -- $(q)scripts/gen_tee_bin.py --input $< --out_tee_bin $@ -+ $(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_tee_bin $@ - - all: $(link-out-dir)/tee-header_v2.bin - cleanfiles += $(link-out-dir)/tee-header_v2.bin - $(link-out-dir)/tee-header_v2.bin: $(link-out-dir)/tee.elf \ - scripts/gen_tee_bin.py - @$(cmd-echo-silent) ' GEN $@' -- $(q)scripts/gen_tee_bin.py --input $< --out_header_v2 $@ -+ $(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_header_v2 $@ - - all: $(link-out-dir)/tee-pager_v2.bin - cleanfiles += $(link-out-dir)/tee-pager_v2.bin - $(link-out-dir)/tee-pager_v2.bin: $(link-out-dir)/tee.elf scripts/gen_tee_bin.py - @$(cmd-echo-silent) ' GEN $@' -- $(q)scripts/gen_tee_bin.py --input $< --out_pager_v2 $@ -+ $(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_pager_v2 $@ - - all: $(link-out-dir)/tee-pageable_v2.bin - cleanfiles += $(link-out-dir)/tee-pageable_v2.bin - $(link-out-dir)/tee-pageable_v2.bin: $(link-out-dir)/tee.elf \ - scripts/gen_tee_bin.py - @$(cmd-echo-silent) ' GEN $@' -- $(q)scripts/gen_tee_bin.py --input $< --out_pageable_v2 $@ -+ $(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_pageable_v2 $@ - - all: $(link-out-dir)/tee.symb_sizes - cleanfiles += $(link-out-dir)/tee.symb_sizes -@@ -222,5 +222,5 @@ mem_usage: $(link-out-dir)/tee.mem_usage - - $(link-out-dir)/tee.mem_usage: $(link-out-dir)/tee.elf - @$(cmd-echo-silent) ' GEN $@' -- $(q)./scripts/mem_usage.py $< > $@ -+ $(q)$(PYTHON3) ./scripts/mem_usage.py $< > $@ - endif -diff --git a/core/sub.mk b/core/sub.mk -index 03cc6bc7..0959c9a9 100644 ---- a/core/sub.mk -+++ b/core/sub.mk -@@ -9,13 +9,13 @@ ifeq ($(CFG_WITH_USER_TA),y) - gensrcs-y += ta_pub_key - produce-ta_pub_key = ta_pub_key.c - depends-ta_pub_key = $(TA_SIGN_KEY) scripts/pem_to_pub_c.py --recipe-ta_pub_key = scripts/pem_to_pub_c.py --prefix ta_pub_key \ -+recipe-ta_pub_key = $(PYTHON3) scripts/pem_to_pub_c.py --prefix ta_pub_key \ - --key $(TA_SIGN_KEY) --out $(sub-dir-out)/ta_pub_key.c - - gensrcs-y += ldelf - produce-ldelf = ldelf_hex.c - depends-ldelf = scripts/gen_ldelf_hex.py $(out-dir)/ldelf/ldelf.elf --recipe-ldelf = scripts/gen_ldelf_hex.py --input $(out-dir)/ldelf/ldelf.elf \ -+recipe-ldelf = $(PYTHON3) scripts/gen_ldelf_hex.py --input $(out-dir)/ldelf/ldelf.elf \ - --output $(sub-dir-out)/ldelf_hex.c - endif - -@@ -25,7 +25,7 @@ early-ta-$1-uuid := $(firstword $(subst ., ,$(notdir $1))) - gensrcs-y += early-ta-$1 - produce-early-ta-$1 = early_ta_$$(early-ta-$1-uuid).c - depends-early-ta-$1 = $1 scripts/ta_bin_to_c.py --recipe-early-ta-$1 = scripts/ta_bin_to_c.py --compress --ta $1 \ -+recipe-early-ta-$1 = $(PYTHON3) scripts/ta_bin_to_c.py --compress --ta $1 \ - --out $(sub-dir-out)/early_ta_$$(early-ta-$1-uuid).c - endef - $(foreach f, $(EARLY_TA_PATHS), $(eval $(call process_early_ta,$(f)))) -@@ -40,7 +40,7 @@ core-embed-fdt-c = $(out-dir)/$(arch-dir)/dts/$(CFG_EMBED_DTB_SOURCE_FILE:.dts=. - gensrcs-y += embedded_secure_dtb - produce-embedded_secure_dtb = arch/$(ARCH)/dts/$(CFG_EMBED_DTB_SOURCE_FILE:.dts=.c) - depends-embedded_secure_dtb = $(core-embed-fdt-dtb) scripts/bin_to_c.py --recipe-embedded_secure_dtb = scripts/bin_to_c.py \ -+recipe-embedded_secure_dtb = $(PYTHON3) scripts/bin_to_c.py \ - --bin $(core-embed-fdt-dtb) \ - --vname embedded_secure_dtb \ - --out $(core-embed-fdt-c) -@@ -58,7 +58,7 @@ $(conf-mk-xz-base64): $(conf-mk-file) - gensrcs-y += conf_str - produce-conf_str = conf.mk.xz.base64.c - depends-conf_str = $(conf-mk-xz-base64) --recipe-conf_str = scripts/bin_to_c.py --text --bin $(conf-mk-xz-base64) \ -+recipe-conf_str = $(PYTHON3) scripts/bin_to_c.py --text --bin $(conf-mk-xz-base64) \ - --out $(sub-dir-out)/conf.mk.xz.base64.c \ - --vname conf_str - endif -diff --git a/mk/config.mk b/mk/config.mk -index 70732c4d..1fe65576 100644 ---- a/mk/config.mk -+++ b/mk/config.mk -@@ -32,6 +32,12 @@ endif - # Supported values: undefined, 1, 2 and 3. 3 gives more warnings. - WARNS ?= 3 - -+# Path to the Python interpreter used by the build system. -+# This variable is set to the default python3 interpreter in the user's -+# path. But build environments that require more explicit control can -+# set the path to a specific interpreter through this variable. -+PYTHON3 ?= python3 -+ - # Define DEBUG=1 to compile without optimization (forces -O0) - # DEBUG=1 - -diff --git a/mk/lib.mk b/mk/lib.mk -index 6e890893..3bd422d6 100644 ---- a/mk/lib.mk -+++ b/mk/lib.mk -@@ -72,7 +72,7 @@ $(lib-shlibstrippedfile): $(lib-shlibfile) - - $(lib-shlibtafile): $(lib-shlibstrippedfile) $(TA_SIGN_KEY) - @$(cmd-echo-silent) ' SIGN $$@' -- $$(q)$$(SIGN) --key $(TA_SIGN_KEY) --uuid $(libuuid) --in $$< --out $$@ -+ $$(q)$$(PYTHON3) $$(SIGN) --key $(TA_SIGN_KEY) --uuid $(libuuid) --in $$< --out $$@ - - $(lib-libuuidln): $(lib-shlibfile) - @$(cmd-echo-silent) ' LN $$@' -diff --git a/ta/arch/arm/link.mk b/ta/arch/arm/link.mk -index db7d0b9a..b95c0cba 100644 ---- a/ta/arch/arm/link.mk -+++ b/ta/arch/arm/link.mk -@@ -2,7 +2,7 @@ link-script$(sm) = $(ta-dev-kit-dir$(sm))/src/ta.ld.S - link-script-pp$(sm) = $(link-out-dir$(sm))/ta.lds - link-script-dep$(sm) = $(link-out-dir$(sm))/.ta.ld.d - --SIGN_ENC ?= $(ta-dev-kit-dir$(sm))/scripts/sign_encrypt.py -+SIGN_ENC ?= $(PYTHON3) $(ta-dev-kit-dir$(sm))/scripts/sign_encrypt.py - TA_SIGN_KEY ?= $(ta-dev-kit-dir$(sm))/keys/default_ta.pem - - ifeq ($(CFG_ENCRYPT_TA),y) -diff --git a/ta/arch/arm/link_shlib.mk b/ta/arch/arm/link_shlib.mk -index ed81e59a..cc177ef0 100644 ---- a/ta/arch/arm/link_shlib.mk -+++ b/ta/arch/arm/link_shlib.mk -@@ -47,5 +47,5 @@ $(link-out-dir)/$(shlibuuid).elf: $(link-out-dir)/$(shlibname).so - $(link-out-dir)/$(shlibuuid).ta: $(link-out-dir)/$(shlibname).stripped.so \ - $(TA_SIGN_KEY) - @$(cmd-echo-silent) ' SIGN $@' -- $(q)$(SIGN) --key $(TA_SIGN_KEY) --uuid $(shlibuuid) \ -+ $(q)$(PYTHON3) $(SIGN) --key $(TA_SIGN_KEY) --uuid $(shlibuuid) \ - --in $< --out $@ -diff --git a/ta/ta.mk b/ta/ta.mk -index 918880f4..59ed87f7 100644 ---- a/ta/ta.mk -+++ b/ta/ta.mk -@@ -67,7 +67,7 @@ $$(arm32-user-sysregs-out)/$$(arm32-user-sysregs-$(1)-h): \ - $(1) scripts/arm32_sysreg.py - @$(cmd-echo-silent) ' GEN $$@' - $(q)mkdir -p $$(dir $$@) -- $(q)scripts/arm32_sysreg.py --guard __$$(arm32-user-sysregs-$(1)-h) \ -+ $(q)$(PYTHON3) scripts/arm32_sysreg.py --guard __$$(arm32-user-sysregs-$(1)-h) \ - < $$< > $$@ - - endef #process-arm32-user-sysreg --- -2.20.1 - diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 5a786833ef..3076be6b42 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.9.0" + bool "3.11.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,7 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.9.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.11.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index f38ebc569f..0d60cebea1 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.9.0.tar.gz -sha256 ac6f145ebde715d4d7a1d5277f4e08a06b660e1c0237c926a274d86cd90ef4c5 optee-os-3.9.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.11.0.tar.gz +sha256 3c34eda1052fbb9ed36fcfdfaecfd2685023b9290670c1a5982f8a0457bfd2cb optee-os-3.11.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index ba5bc51957..e0f01a8a9d 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -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 diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index a87a642581..d43c85cce7 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2020.07" + 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.07" 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 @@ -245,47 +255,31 @@ config BR2_TARGET_UBOOT_FORMAT_BIN config BR2_TARGET_UBOOT_FORMAT_DTB_BIN bool "u-boot-dtb.bin" -config BR2_TARGET_UBOOT_FORMAT_DTB_IMG - bool "u-boot-dtb.img" +config BR2_TARGET_UBOOT_FORMAT_NAND_BIN + bool "u-boot-nand.bin" -config BR2_TARGET_UBOOT_FORMAT_DTB_IMX - bool "u-boot-dtb.imx" +config BR2_TARGET_UBOOT_FORMAT_ELF + bool "u-boot.elf" config BR2_TARGET_UBOOT_FORMAT_IMG bool "u-boot.img" -config BR2_TARGET_UBOOT_FORMAT_ITB - bool "u-boot.itb" +config BR2_TARGET_UBOOT_FORMAT_DTB_IMG + bool "u-boot-dtb.img" config BR2_TARGET_UBOOT_FORMAT_IMX bool "u-boot.imx" -config BR2_TARGET_UBOOT_FORMAT_NAND_BIN - bool "u-boot-nand.bin" +config BR2_TARGET_UBOOT_FORMAT_DTB_IMX + bool "u-boot-dtb.imx" + +config BR2_TARGET_UBOOT_FORMAT_ITB + bool "u-boot.itb" config BR2_TARGET_UBOOT_FORMAT_KWB bool "u-boot.kwb (Marvell)" depends on BR2_arm -config BR2_TARGET_UBOOT_FORMAT_ELF - bool "u-boot.elf" - -config BR2_TARGET_UBOOT_FORMAT_SB - bool "u-boot.sb (Freescale i.MX28)" - depends on BR2_arm - -config BR2_TARGET_UBOOT_FORMAT_SD - bool "u-boot.sd (Freescale i.MX28)" - depends on BR2_arm - help - This is Freescale i.MX28 SB format, with a header for booting - from an SD card. - - U-Boot includes an mxsboot tool to generate this format, - starting from 2011.12. - - See doc/README.mxs (or doc/README.mx28_common before 2013.07) - config BR2_TARGET_UBOOT_FORMAT_NAND bool "u-boot.nand (Freescale i.MX28)" depends on BR2_arm @@ -343,6 +337,26 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE endif +config BR2_TARGET_UBOOT_FORMAT_SB + bool "u-boot.sb (Freescale i.MX28)" + depends on BR2_arm + +config BR2_TARGET_UBOOT_FORMAT_SD + bool "u-boot.sd (Freescale i.MX28)" + depends on BR2_arm + help + This is Freescale i.MX28 SB format, with a header for booting + from an SD card. + + U-Boot includes an mxsboot tool to generate this format, + starting from 2011.12. + + See doc/README.mxs (or doc/README.mx28_common before 2013.07) + +config BR2_TARGET_UBOOT_FORMAT_STM32 + bool "u-boot.stm32" + depends on BR2_arm + config BR2_TARGET_UBOOT_FORMAT_CUSTOM bool "Custom (specify below)" help @@ -533,65 +547,6 @@ config BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC In either case the resulting file will be given a .crc extension. -menuconfig BR2_TARGET_UBOOT_ENVIMAGE - bool "Environment image" - help - Generate a valid binary environment image from a text file - describing the key=value pairs of the environment. - - The environment image will be called uboot-env.bin. - -if BR2_TARGET_UBOOT_ENVIMAGE - -config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE - string "Source files for environment" - help - Text files describing the environment. Files should have - lines of the form var=value, one per line. Blank lines and - lines starting with a # are ignored. - - Multiple source files are concatenated in the order listed. - - Leave empty to generate image from compiled-in env. - -config BR2_TARGET_UBOOT_ENVIMAGE_SIZE - string "Size of environment" - help - Size of envronment, can be prefixed with 0x for hexadecimal - values. - -config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT - bool "Environment has two copies" - help - Some platforms define in their U-Boot configuration that the - U-Boot environment should be duplicated in two locations (for - extra safety). Check your U-Boot configuration for the - CONFIG_ENV_ADDR_REDUND and CONFIG_ENV_SIZE_REDUND settings to - see if this is the case for your platform. - - If it is the case, then you should enable this option to - ensure that the U-Boot environment image generated by - Buildroot is compatible with the "redundant environment" - mechanism of U-Boot. - -endif # BR2_TARGET_UBOOT_ENVIMAGE - -config BR2_TARGET_UBOOT_BOOT_SCRIPT - bool "Generate a U-Boot boot script" - help - Generate a U-Boot boot script, given a file listing U-Boot - commands to be executed at boot time. The generated boot - script will be called 'boot.scr'. - -if BR2_TARGET_UBOOT_BOOT_SCRIPT - -config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE - string "U-Boot boot script source" - help - Source file to generate the U-Boot boot script. - -endif - if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG config BR2_TARGET_UBOOT_CUSTOM_DTS_PATH diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 4b660dd6d8..7cbd785541 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a u-boot-2020.07.tar.bz2 +sha256 b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454 u-boot-2021.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 1831466780..bb45980022 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -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 @@ -121,6 +123,11 @@ UBOOT_MAKE_TARGET += u-boot.sb UBOOT_DEPENDENCIES += host-elftosb host-openssl endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_STM32),y) +UBOOT_BINS += u-boot.stm32 +UBOOT_MAKE_TARGET += u-boot.stm32 +endif + ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y) UBOOT_BINS += $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME)) endif @@ -156,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) @@ -312,21 +324,6 @@ define UBOOT_BUILD_OMAP_IFT -c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)) endef -ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),) -UBOOT_GENERATE_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) -define UBOOT_GENERATE_ENV_IMAGE - $(if $(UBOOT_GENERATE_ENV_FILE), \ - cat $(UBOOT_GENERATE_ENV_FILE), \ - CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D)) \ - >$(@D)/buildroot-env.txt - $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ - $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ - $(if $(filter "BIG",$(BR2_ENDIAN)),-b) \ - -o $(BINARIES_DIR)/uboot-env.bin \ - $(@D)/buildroot-env.txt -endef -endif - define UBOOT_INSTALL_IMAGES_CMDS $(foreach f,$(UBOOT_BINS), \ cp -dpf $(@D)/$(f) $(BINARIES_DIR)/ @@ -338,11 +335,6 @@ define UBOOT_INSTALL_IMAGES_CMDS cp -dpf $(@D)/$(f) $(BINARIES_DIR)/ ) ) - $(UBOOT_GENERATE_ENV_IMAGE) - $(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT), - $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \ - -d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \ - $(BINARIES_DIR)/boot.scr) endef ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y) @@ -443,24 +435,6 @@ define UBOOT_KCONFIG_FIXUP_CMDS $(UBOOT_ZYNQMP_KCONFIG_PSU_INIT) endef -ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y) -ifeq ($(BR_BUILDING),y) -ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SIZE)),) -$(error Please provide U-Boot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting)) -endif -endif -UBOOT_DEPENDENCIES += host-uboot-tools -endif - -ifeq ($(BR2_TARGET_UBOOT_BOOT_SCRIPT),y) -ifeq ($(BR_BUILDING),y) -ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)),) -$(error Please define a source file for U-Boot boot script (BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE setting)) -endif -endif -UBOOT_DEPENDENCIES += host-uboot-tools -endif - ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy) # @@ -510,7 +484,7 @@ ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),) $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting) endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),) -$(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) +$(error No custom U-Boot repository version specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG diff --git a/boot/vexpress-firmware/vexpress-firmware.hash b/boot/vexpress-firmware/vexpress-firmware.hash index 40f64c7528..ac636e1512 100644 --- a/boot/vexpress-firmware/vexpress-firmware.hash +++ b/boot/vexpress-firmware/vexpress-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 def599c86ab3606f7f67c0190e9b237fbc0cf934a951ffb1c5fb0c47d8a8f3d2 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3.tar.gz +sha256 ea92d686e6e211074fb0f62cb5e011f4cfc294c7f6ec9fb27b7d987db7bf51c5 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3-br1.tar.gz |