Use TOOLCHAIN variable instead of directly inheriting the class.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../trusted-firmware-a/trusted-firmware-a_2.%.bbappend | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend b/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend index da47a7a..c4bfc69 100644 --- a/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend +++ b/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend @@ -1,17 +1,19 @@ -inherit llvm-morello-native +
COMPATIBLE_MACHINE = "morello" SUMMARY = "TF-A to be compiled with LLVM Morello" OUTPUTS_NAME = "trusted-firmware-a" SECTION = "firmware"
+TOOLCHAIN = "${MORELLO_TOOLCHAIN}" + MACHINE_TFA_REQUIRE ?= "" MACHINE_TFA_REQUIRE:morello-fvp = "tfa-firmware-morello-fvp.inc" MACHINE_TFA_REQUIRE:morello-soc = "tfa-firmware-morello-soc.inc"
require ${MACHINE_TFA_REQUIRE}
-PROVIDES += "virtual/${OUTPUTS_NAME}" +PROVIDES += "virtual/${OUTPUTS_NAME}"
SRC_URI = "gitsm://git.morello-project.org/morello/trusted-firmware-a;protocol=https;name=tfa;branch=${SRCBRANCH}" SRCREV_tfa = "3ce2815936774fe924ec7538151b71085c2f18d9"