From 235e3d5543f88fd46baa75ae6c9157dfa25db0b2 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 19 Feb 2025 16:48:01 -0500 Subject: trusted-firmware-a: simplify TI customizations The original .bbappend started with just a few customizations behind a :k3 SoC override, but eventually grew in size. It got converted into a .inc file, which is behind the same SoC override and hence it gets included by .bbappend only for K3 platforms: https://git.yoctoproject.org/meta-ti/commit/?id=389f9a8b726868768a8bed6cbe0b2a1f18c05410 It doesn't make sense to use the same :k3 override inside this .inc file for every variable. Moreover, it makes it harder to change those variables downstream for any derivative platform or even for upstream testing. This change drops redundant :k3 SoC overrides, w/o changing existing behavior. It allows easier modifications of such customizations from downstream layers or a local.conf, e.g. SRC_URI_TRUSTED_FIRMWARE_A Note that SRC_URI is set exactly the same as in upstream base .inc file, but version-specific recipes in meta-arm tend to add extra patches directly to SRC_URI, which is undesirable here. Thus, reset SRC_URI back to its default. Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- .../trusted-firmware-a/trusted-firmware-a-ti.inc | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc index 9971e960..21aef489 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc @@ -1,14 +1,20 @@ -PV:k3 = "2.12+git" -SRCREV_tfa:k3 = "5227171c079d0c7d22a6d37b5cec079c8c5bb4b1" -LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130" -SRC_URI:k3 = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https;name=tfa;branch=ti-master" -COMPATIBLE_MACHINE:k3 = "k3" -TFA_BUILD_TARGET:k3 = "all" -TFA_INSTALL_TARGET:k3 = "bl31" -TFA_SPD:k3 = "opteed" +# NOTE: This .inc file with customizations only gets included for K3 platforms + +PV = "2.12+git" +SRCREV_tfa = "5227171c079d0c7d22a6d37b5cec079c8c5bb4b1" +SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https" +SRCBRANCH = "ti-master" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}" + +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130" +COMPATIBLE_MACHINE = "k3" + +TFA_BUILD_TARGET = "all" +TFA_INSTALL_TARGET = "bl31" +TFA_SPD = "opteed" # For am62lxx, install bl1 & bl31 using TFA_INSTALL_TARGET TFA_INSTALL_TARGET:am62lxx = "bl31 bl1" -EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" -EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" +EXTRA_OEMAKE += "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" +EXTRA_OEMAKE += "${@ 'K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" -- cgit v1.2.3-54-g00ecf