Request the machine dependent include file. There was a bug in this recipe, TARGET_PLATFROM was missing a single quote.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../trusted-firmware-a/tfa-firmware-morello-fvp.inc | 2 ++ .../trusted-firmware-a/tfa-firmware-morello-soc.inc | 2 ++ .../trusted-firmware-a/trusted-firmware-a_2.%.bbappend | 10 +++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 recipes-bsp/trusted-firmware-a/tfa-firmware-morello-fvp.inc create mode 100644 recipes-bsp/trusted-firmware-a/tfa-firmware-morello-soc.inc
diff --git a/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-fvp.inc b/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-fvp.inc new file mode 100644 index 0000000..8080147 --- /dev/null +++ b/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-fvp.inc @@ -0,0 +1,2 @@ +TFA_INSTALL_TARGET = "bl1 bl2 bl31 dtbs morello-fvp morello_fw_config morello_tb_fw_config morello_nt_fw_config" +TARGET_PLATFORM = "fvp" \ No newline at end of file diff --git a/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-soc.inc b/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-soc.inc new file mode 100644 index 0000000..a1c8b06 --- /dev/null +++ b/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-soc.inc @@ -0,0 +1,2 @@ +TFA_INSTALL_TARGET = "bl1 bl2 bl31 dtbs morello-soc morello_fw_config morello_tb_fw_config morello_nt_fw_config" +TARGET_PLATFORM = "soc" diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend index 227dc57..da47a7a 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend @@ -5,6 +5,12 @@ SUMMARY = "TF-A to be compiled with LLVM Morello" OUTPUTS_NAME = "trusted-firmware-a" SECTION = "firmware"
+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}"
SRC_URI = "gitsm://git.morello-project.org/morello/trusted-firmware-a;protocol=https;name=tfa;branch=${SRCBRANCH}" @@ -26,8 +32,6 @@ TFA_UBOOT = "0" TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs" TFA_DEBUG = "0"
-TFA_INSTALL_TARGET = "bl1 bl2 bl31 dtbs morello-soc morello_fw_config morello_tb_fw_config morello_nt_fw_config " - ARM_TF_ARCH = "aarch64"
EXTRA_OEMAKE += "\ @@ -36,7 +40,7 @@ EXTRA_OEMAKE += "\ ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem \ TRUSTED_BOARD_BOOT=1 \ ARM_ROTPK_LOCATION=devel_rsa \ - TARGET_PLATFORM=soc \ + TARGET_PLATFORM='${TARGET_PLATFORM}' \ ENABLE_MORELLO_CAP=1 \ ARCH='${ARM_TF_ARCH}' \ "