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 f48ac64a..bdffec88 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 @@ -13,6 +13,9 @@ LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" # 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 = " \ diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc index a9cf38fb..f9cb2885 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc @@ -8,10 +8,12 @@ TFA_DEBUG = "1" TFA_MBEDTLS = "0" TFA_UBOOT = "0" +SRCREV_tfa = "dffd5192df41e77e27bb524bfe64d747c1c43522" + SRC_URI_append = " \ file://0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch \ " - -SRCREV_tfa = "dffd5192df41e77e27bb524bfe64d747c1c43522" +# 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}" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc index 9af04e8a..8d989376 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc @@ -3,6 +3,9 @@ # Intermediate SHA with 2.3 baseline version SRCREV_tfa = "16796a25fefc4ecf780211bf554d3b8dc5436fa4" +# This is incorporated into the SRCREV above +SRC_URI_remove = "file://0001-fdts-a5ds-Fix-for-the-system-timer-issue.patch" + DEPENDS += "scp-firmware" COMPATIBLE_MACHINE = "tc0"