From 8b7ec0affa343631ee9877f3e8ccd2731d6f8a52 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 7 Jul 2020 17:24:58 +0100 Subject: [PATCH] arm-bsp/trusted-firmware-a: move A5 DesignStart to 2.3 0001-plat-arm-a5ds-move-dtb-to-a-new-address.patch was never applied, and has been merged upstream so drop it. The recipe was using the _git.bb recipe and setting the SRCREV to a commit 300+ commits past 2.2 but not quite 2.3. Instead, just use 2.3. Change-Id: I76aee592e7ce3ec23268872d7f202efa945e5e59 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- ...t-arm-a5ds-move-dtb-to-a-new-address.patch | 31 ------------------- .../trusted-firmware-a-a5ds.inc | 5 --- .../trusted-firmware-a_2.3.bbappend | 1 + .../trusted-firmware-a_git.bbappend | 7 ----- 4 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/a5ds/0001-plat-arm-a5ds-move-dtb-to-a-new-address.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bbappend diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/a5ds/0001-plat-arm-a5ds-move-dtb-to-a-new-address.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/a5ds/0001-plat-arm-a5ds-move-dtb-to-a-new-address.patch deleted file mode 100644 index 8d848ec9..00000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/a5ds/0001-plat-arm-a5ds-move-dtb-to-a-new-address.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d3cadbc6f1060020960dc05af0465db919bbbe2b Mon Sep 17 00:00:00 2001 -From: Rui Miguel Silva -Date: Fri, 30 Aug 2019 13:38:44 +0100 -Subject: [PATCH] plat/arm: a5ds: move dtb to a new address - -When Using bigger kernel images (>8.4MB compressed zImage) and at -decompress and final location init stage of kernel start makes it -override dtb at this address, to avoid this move the dtb a little -higher in address related. - -Signed-off-by: Rui Miguel Silva ---- - plat/arm/board/a5ds/fdts/a5ds_tb_fw_config.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plat/arm/board/a5ds/fdts/a5ds_tb_fw_config.dts b/plat/arm/board/a5ds/fdts/a5ds_tb_fw_config.dts -index 9ab2d9656600..c616ff772237 100644 ---- a/plat/arm/board/a5ds/fdts/a5ds_tb_fw_config.dts -+++ b/plat/arm/board/a5ds/fdts/a5ds_tb_fw_config.dts -@@ -10,7 +10,7 @@ - /* Platform Config */ - plat_arm_bl2 { - compatible = "arm,tb_fw"; -- hw_config_addr = <0x0 0x82000000>; -+ hw_config_addr = <0x0 0x83000000>; - hw_config_max_size = <0x01000000>; - /* Disable authentication for development */ - disable_auth = <0x0>; --- -2.22.1 - diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-a5ds.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-a5ds.inc index aa21b743..d8927944 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-a5ds.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-a5ds.inc @@ -7,9 +7,6 @@ TFA_UBOOT = "1" TFA_BUILD_TARGET = "all fip" TFA_INSTALL_TARGET = "bl1.bin fip.bin" -SRCREV = "5d3ee0764b03567bf3501edf47d67d72daff0cb3" -LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" - EXTRA_OEMAKE_append = " \ ARCH=aarch32 \ FVP_HW_CONFIG_DTS=fdts/a5ds.dts \ @@ -18,5 +15,3 @@ EXTRA_OEMAKE_append = " \ ARM_CORTEX_A5=yes \ ARM_XLAT_TABLES_LIB_V1=1 \ " - - diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend index b642708a..d8aa786c 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend @@ -2,5 +2,6 @@ MACHINE_TFA_REQUIRE ?= "" MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc" +MACHINE_TFA_REQUIRE_a5ds = "trusted-firmware-a-a5ds.inc" require ${MACHINE_TFA_REQUIRE} diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bbappend deleted file mode 100644 index 772f65a1..00000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -# Machine specific TFAs - -MACHINE_TFA_REQUIRE ?= "" - -MACHINE_TFA_REQUIRE_a5ds = "trusted-firmware-a-a5ds.inc" - -require ${MACHINE_TFA_REQUIRE}