Skip to contentSkip to conversation

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

PATCH In review Ross Burton 2 participants 2 messages Jul 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm-bsp/trusted-firmware-a: move machine customisations to the versioned appends

From: Ross Burton <[email protected]>

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
---
 .../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
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend +1 -9
index 2ce14b8..e5b10ff 100644
@@ -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
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend new file +6 -0
new file mode 100644
index 0000000..f5f1632
@@ -0,0 +1,6 @@
+# Machine specific TFAs
+
+MACHINE_TFA_REQUIRE ?= ""
+MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
+
+require ${MACHINE_TFA_REQUIRE}
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend +2 -0
index d8aa786..f37c589 100644
@@ -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}
Signature · 1 line
2.26.2
#1 lore raw
Quoted 9 lines · Ross Burton

From: Ross Burton <[email protected]>

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

Quoted 6 lines

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

Pulled into master.

Thanks,
Jon

Quoted 54 lines
---
 .../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
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend +1 -9
index 2ce14b8..e5b10ff 100644
@@ -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
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend new file +6 -0
new file mode 100644
index 0000000..f5f1632
@@ -0,0 +1,6 @@
+# Machine specific TFAs
+
+MACHINE_TFA_REQUIRE ?= ""
+MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
+
+require ${MACHINE_TFA_REQUIRE}
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend +2 -0
index d8aa786..f37c589 100644
@@ -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}
Signature · 1 line
2.26.2