From 68b1e2d3e3c9d25d894bf76e2cf700bf383e464c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 4 May 2022 14:17:11 +0100 Subject: [PATCH] arm-bsp/trusted-firmware-m: move corstone1000 to TF-M 1.6.0. Move the TFM_PLATFORM assignment to the bbappend. Drop the SRCREV changes, these are all incorporated into the 1.6.0 release. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/include/corstone1000.inc | 2 -- .../trusted-firmware-m-corstone1000.inc | 14 +++----------- ....bbappend => trusted-firmware-m_1.6.%.bbappend} | 0 3 files changed, 3 insertions(+), 13 deletions(-) rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/{trusted-firmware-m_1.5%.bbappend => trusted-firmware-m_1.6.%.bbappend} (100%) diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 1faccd0b..d38773a3 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -10,8 +10,6 @@ TFA_BL2_BINARY = "bl2-corstone1000.bin" TFA_FIP_BINARY = "fip-corstone1000.bin" # TF-M -PREFERRED_VERSION_trusted-firmware-m ?= "1.5%" -TFM_PLATFORM = "arm/corstone1000" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m" # TF-M settings for signing host images diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc index f387be5a..eb400e52 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc @@ -2,6 +2,8 @@ COMPATIBLE_MACHINE = "(corstone1000)" +TFM_PLATFORM = "arm/corstone1000" + TFM_DEBUG = "1" ## Default is the MPS3 board @@ -9,14 +11,6 @@ TFM_PLATFORM_IS_FVP ?= "FALSE" EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}" EXTRA_OECMAKE += "-DCC312_LEGACY_DRIVER_API_ENABLED=OFF" -SRCBRANCH_tfm = "master" -SRCREV_tfm = "f8c7e5361b92b16108165601ea81c5d01feb3c22" -SRCREV_mbedtls = "d65aeb37349ad1a50e0f6c9b694d4b5290d60e49" -SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8" - -PV = "1.5.0+git${SRCPV}" -SRCREV_FORMAT = "tfm" - # libmetal LICENSE += "& BSD-3-Clause" LIC_FILES_CHKSUM += "file://../libmetal/LICENSE.md;md5=fe0b8a4beea8f0813b606d15a3df3d3c" @@ -31,9 +25,7 @@ SRC_URI += "git://github.com/OpenAMP/open-amp.git;protocol=https;branch=main;nam SRCREV_openamp = "347397decaa43372fc4d00f965640ebde042966d" EXTRA_OECMAKE += "-DLIBOPENAMP_SRC_PATH=${WORKDIR}/git/openamp -DLIBOPENAMP_BIN_PATH=${B}/libopenamp-build" -# The install task signs the TF-A BL2 and FIP binaries. -# So they need to be copied to the sysroot. Hence the dependencies below: -do_prepare_recipe_sysroot[depends]+= "trusted-firmware-a:do_populate_sysroot" +DEPENDS += "trusted-firmware-a" # adding host images signing support require trusted-firmware-m-sign-host-images.inc diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.6.%.bbappend similarity index 100% rename from meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5%.bbappend rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.6.%.bbappend