[meta-arm] arm-bsp/trusted-firmware-a: move machine customisations to the versioned appends

Submitted by Ross Burton on July 14, 2020, 11:03 a.m. | Patch ID: 174430

Details

Message ID 20200714110345.570531-1-ross@burtonini.com
State New
Headers show

Commit Message

Ross Burton July 14, 2020, 11:03 a.m.
From: Ross Burton <ross.burton@arm.com>

By having MACHINE_TFA_REQUIRE set and required in both the wildcard
bbappend and the versioned append, the same file can get included twice
which results in a warning from bitbake:

WARNING: trusted-firmware-a_2.3.bb: Duplicate inclusion for
trusted-firmware-a-juno.inc in trusted-firmware-a_2.3.bbappend

Move the customisations from the wildcard bbappend to the specific
version of trusted-firmware-a that is used for that platform to be clear
about what platforms are supported and remove this warning.

Change-Id: Ib220aedbf94fa11d21ddc6c5f9ac2c5de5c66b7a
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../trusted-firmware-a/trusted-firmware-a_2.%.bbappend | 10 +---------
 .../trusted-firmware-a/trusted-firmware-a_2.1.bbappend |  6 ++++++
 .../trusted-firmware-a/trusted-firmware-a_2.3.bbappend |  2 ++
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend

Patch hide | download patch | download mbox

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 2ce14b8..e5b10ff 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,11 +1,3 @@ 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files/:"
 
-# Machine specific TFAs
-
-MACHINE_TFA_REQUIRE ?= ""
-
-MACHINE_TFA_REQUIRE_foundation-armv8 = "trusted-firmware-a-fvp.inc"
-MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
-MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
-
-require ${MACHINE_TFA_REQUIRE}
+# Don't put machine customisation in here, use a versioned append.
\ No newline at end of file
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
new file mode 100644
index 0000000..f5f1632
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
@@ -0,0 +1,6 @@ 
+# Machine specific TFAs
+
+MACHINE_TFA_REQUIRE ?= ""
+MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
+
+require ${MACHINE_TFA_REQUIRE}
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 d8aa786..f37c589 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
@@ -3,5 +3,7 @@ 
 MACHINE_TFA_REQUIRE ?= ""
 MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc"
 MACHINE_TFA_REQUIRE_a5ds = "trusted-firmware-a-a5ds.inc"
+MACHINE_TFA_REQUIRE_foundation-armv8 = "trusted-firmware-a-fvp.inc"
+MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
 
 require ${MACHINE_TFA_REQUIRE}

Comments

Jon Mason July 14, 2020, 6:57 p.m.
On Tue, Jul 14, 2020 at 12:03:45PM +0100, Ross Burton wrote:
> From: Ross Burton <ross.burton@arm.com>
> 
> By having MACHINE_TFA_REQUIRE set and required in both the wildcard
> bbappend and the versioned append, the same file can get included twice
> which results in a warning from bitbake:
> 
> WARNING: trusted-firmware-a_2.3.bb: Duplicate inclusion for
> trusted-firmware-a-juno.inc in trusted-firmware-a_2.3.bbappend
> 
> Move the customisations from the wildcard bbappend to the specific
> version of trusted-firmware-a that is used for that platform to be clear
> about what platforms are supported and remove this warning.
> 
> Change-Id: Ib220aedbf94fa11d21ddc6c5f9ac2c5de5c66b7a
> Signed-off-by: Ross Burton <ross.burton@arm.com>

Pulled into master.

Thanks,
Jon

> ---
>  .../trusted-firmware-a/trusted-firmware-a_2.%.bbappend | 10 +---------
>  .../trusted-firmware-a/trusted-firmware-a_2.1.bbappend |  6 ++++++
>  .../trusted-firmware-a/trusted-firmware-a_2.3.bbappend |  2 ++
>  3 files changed, 9 insertions(+), 9 deletions(-)
>  create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
> 
> 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 2ce14b8..e5b10ff 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,11 +1,3 @@
>  FILESEXTRAPATHS_prepend := "${THISDIR}/files/:"
>  
> -# Machine specific TFAs
> -
> -MACHINE_TFA_REQUIRE ?= ""
> -
> -MACHINE_TFA_REQUIRE_foundation-armv8 = "trusted-firmware-a-fvp.inc"
> -MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
> -MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
> -
> -require ${MACHINE_TFA_REQUIRE}
> +# Don't put machine customisation in here, use a versioned append.
> \ No newline at end of file
> diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
> new file mode 100644
> index 0000000..f5f1632
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
> @@ -0,0 +1,6 @@
> +# Machine specific TFAs
> +
> +MACHINE_TFA_REQUIRE ?= ""
> +MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
> +
> +require ${MACHINE_TFA_REQUIRE}
> 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 d8aa786..f37c589 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
> @@ -3,5 +3,7 @@
>  MACHINE_TFA_REQUIRE ?= ""
>  MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc"
>  MACHINE_TFA_REQUIRE_a5ds = "trusted-firmware-a-a5ds.inc"
> +MACHINE_TFA_REQUIRE_foundation-armv8 = "trusted-firmware-a-fvp.inc"
> +MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
>  
>  require ${MACHINE_TFA_REQUIRE}
> -- 
> 2.26.2
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#853): https://lists.yoctoproject.org/g/meta-arm/message/853
Mute This Topic: https://lists.yoctoproject.org/mt/75496207/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-