| Message ID | 20211216101828.3239975-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | trusted-firmware-a: move corstone1000 to TF-A 2.6 | expand |
On Thu, 16 Dec 2021 10:18:28 +0000, Ross Burton wrote: > Now that we have a TF-A 2.6 recipe there is no need to use a post-2.5 > git snapshot. > > Applied, thanks! [1/1] trusted-firmware-a: move corstone1000 to TF-A 2.6 commit: c4f5359672f1ca77d87cc45cbe5e9cdf258058c2 Best regards,
diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 6684c726..f9d301e4 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -4,7 +4,6 @@ MACHINEOVERRIDES =. "corstone1000:" # TF-A TFA_PLATFORM = "corstone1000" -PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" EXTRA_IMAGEDEPENDS += "trusted-firmware-a" TFA_BL2_BINARY = "bl2-corstone1000.bin" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc index 1a5bdd0c..2646259f 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc @@ -2,14 +2,6 @@ COMPATIBLE_MACHINE = "(corstone1000)" -SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" - -# TF-A master branch post 2.5 with all Corstone1000 patches merged -SRCREV_tfa = "459b24451a0829460783ce8dfa15561e36d901d8" -PV = "2.5+git${SRCPV}" - -LIC_FILES_CHKSUM="file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - FILESEXTRAPATHS:prepend := "${THISDIR}/files/corstone1000:" SRC_URI:append = " \ file://0001-Rename-Diphda-to-corstone1000.patch \
Now that we have a TF-A 2.6 recipe there is no need to use a post-2.5 git snapshot. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta-arm-bsp/conf/machine/include/corstone1000.inc | 1 - .../trusted-firmware-a-corstone1000.inc | 8 -------- 2 files changed, 9 deletions(-)