* [PATCH 1/2] arm-bsp/trusted-firmware-a: move A5 DesignStart to 2.3
@ 2020-07-07 16:24 Ross Burton
2020-07-07 16:24 ` [PATCH 2/2] arm-bsp/trusted-firmware-a: consolidate FILESEXTRAPATHS Ross Burton
2020-07-09 12:51 ` [meta-arm] [PATCH 1/2] arm-bsp/trusted-firmware-a: move A5 DesignStart to 2.3 Jon Mason
0 siblings, 2 replies; 3+ messages in thread
From: Ross Burton @ 2020-07-07 16:24 UTC (permalink / raw)
To: meta-arm
From: Ross Burton <ross.burton@arm.com>
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 <ross.burton@arm.com>
---
...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 8d848ec..0000000
--- 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 <rui.silva@linaro.org>
-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 <rui.silva@linaro.org>
----
- 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 aa21b74..d892794 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 b642708..d8aa786 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 772f65a..0000000
--- 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}
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] arm-bsp/trusted-firmware-a: consolidate FILESEXTRAPATHS
2020-07-07 16:24 [PATCH 1/2] arm-bsp/trusted-firmware-a: move A5 DesignStart to 2.3 Ross Burton
@ 2020-07-07 16:24 ` Ross Burton
2020-07-09 12:51 ` [meta-arm] [PATCH 1/2] arm-bsp/trusted-firmware-a: move A5 DesignStart to 2.3 Jon Mason
1 sibling, 0 replies; 3+ messages in thread
From: Ross Burton @ 2020-07-07 16:24 UTC (permalink / raw)
To: meta-arm
From: Ross Burton <ross.burton@arm.com>
There's no need to set FILESEXTRAPATHS to "${THISDIR}/files/n1sdp:" when
n1sdp is the name of the current MACHINE as bitbake will search for
override-named directories automatically.
Instead just add ${THISDIR}/files and let bitbake do it's thing.
Change-Id: I0f58933ff9e56ee41a8fdd55f467d263c4e1b1e7
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc | 1 -
.../trusted-firmware-a/trusted-firmware-a_2.%.bbappend | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc
index ad4af5a..ef71ae5 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc
@@ -7,7 +7,6 @@ TFA_DEBUG = "1"
TFA_MBEDTLS = "0"
TFA_UBOOT = "0"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/n1sdp:"
SRC_URI_append = " \
file://0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch \
"
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend
index 4791538..2ce14b8 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend
@@ -1,3 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files/:"
+
# Machine specific TFAs
MACHINE_TFA_REQUIRE ?= ""
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-arm] [PATCH 1/2] arm-bsp/trusted-firmware-a: move A5 DesignStart to 2.3
2020-07-07 16:24 [PATCH 1/2] arm-bsp/trusted-firmware-a: move A5 DesignStart to 2.3 Ross Burton
2020-07-07 16:24 ` [PATCH 2/2] arm-bsp/trusted-firmware-a: consolidate FILESEXTRAPATHS Ross Burton
@ 2020-07-09 12:51 ` Jon Mason
1 sibling, 0 replies; 3+ messages in thread
From: Jon Mason @ 2020-07-09 12:51 UTC (permalink / raw)
To: Ross Burton; +Cc: meta-arm
On Tue, Jul 07, 2020 at 05:24:58PM +0100, Ross Burton wrote:
> From: Ross Burton <ross.burton@arm.com>
>
> 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 <ross.burton@arm.com>
Series applied to master.
Thanks,
Jon
> ---
> ...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 8d848ec..0000000
> --- 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 <rui.silva@linaro.org>
> -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 <rui.silva@linaro.org>
> ----
> - 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 aa21b74..d892794 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 b642708..d8aa786 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 772f65a..0000000
> --- 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}
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-09 12:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-07 16:24 [PATCH 1/2] arm-bsp/trusted-firmware-a: move A5 DesignStart to 2.3 Ross Burton
2020-07-07 16:24 ` [PATCH 2/2] arm-bsp/trusted-firmware-a: consolidate FILESEXTRAPATHS Ross Burton
2020-07-09 12:51 ` [meta-arm] [PATCH 1/2] arm-bsp/trusted-firmware-a: move A5 DesignStart to 2.3 Jon Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.