From 5b2d4560938ea75cc7c4064d067bf681f0f20ae6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 14 Jul 2020 12:03:45 +0100 Subject: [PATCH] arm-bsp/trusted-firmware-a: move machine customisations to the versioned appends 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 Signed-off-by: Jon Mason --- .../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 2ce14b80..e5b10ff3 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 00000000..f5f16326 --- /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 d8aa786c..f37c5898 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}