diff --git a/meta-arm-bsp/conf/machine/include/corstone700.inc b/meta-arm-bsp/conf/machine/include/corstone700.inc index ab3e2a42..9e79e10b 100644 --- a/meta-arm-bsp/conf/machine/include/corstone700.inc +++ b/meta-arm-bsp/conf/machine/include/corstone700.inc @@ -11,8 +11,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel_corstone700 = "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "5.6%" -PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" -PREFERRED_VERSION_trusted-firmware-a ?= "2.3%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.4%" PREFERRED_PROVIDER_virtual/control-processor-firmware ?= "boot-firmware" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc index bdffec88..5755005f 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc @@ -7,17 +7,6 @@ TFA_UBOOT = "1" TFA_BUILD_TARGET = "all fip" TFA_INSTALL_TARGET = "fip.bin" -LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" - -# TF-A v2.3 is not used because the following commit is needed: -# fdts: corstone700: add NXP isp1763 node to device tree -SRCREV_tfa = "a6f65b11529b618ff04017f64054dc661c489068" - -# This is incorporated into the SRCREV above -SRC_URI_remove = "file://0001-fdts-a5ds-Fix-for-the-system-timer-issue.patch" - -PV = "2.3+git${SRCPV}" - EXTRA_OEMAKE_append = " \ ARCH=aarch32 \ TARGET_PLATFORM=${TFA_TARGET_PLATFORM} \ 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 0535278a..2337cafe 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,6 +3,5 @@ MACHINE_TFA_REQUIRE ?= "" MACHINE_TFA_REQUIRE_corstone500 = "trusted-firmware-a-corstone500.inc" MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc" -MACHINE_TFA_REQUIRE_corstone700 = "trusted-firmware-a-corstone700.inc" require ${MACHINE_TFA_REQUIRE} diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend index 8087f39d..222aac90 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend @@ -1,6 +1,7 @@ # Machine specific TFAs MACHINE_TFA_REQUIRE ?= "" +MACHINE_TFA_REQUIRE_corstone700 = "trusted-firmware-a-corstone700.inc" MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc" MACHINE_TFA_REQUIRE_fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc" MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"