From b1e01a2ceda8084e4811539335123e649d736c09 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Sat, 2 Jul 2022 15:17:07 -0400 Subject: [PATCH] arm/trusted-firmware-a: Fix v1.5 recipe 0003-xlat-tables-v2-remove-tautological-assert.patch does not apply on the TF-A v1.5 sources. Move that file append to the v2.4 recipe so that it will not attempt to apply for v1.5. Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 1 - .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 807e1254..cea5476a 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -57,7 +57,6 @@ SRCREV_FORMAT_append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', SRC_URI_append = " \ file://0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch \ - file://0003-xlat-tables-v2-remove-tautological-assert.patch \ " # U-boot support (set TFA_UBOOT to 1 to activate) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb index f23132af..d8e87405 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb @@ -13,3 +13,5 @@ SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht SRCREV_mbedtls = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI_append = "file://0003-xlat-tables-v2-remove-tautological-assert.patch"