From 4271bda58bf9171485a828d1e57964d6df14433a Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 7 Nov 2023 13:57:18 -0800 Subject: [PATCH 1/2] imx-atf-boundary: Update to boundary-lf-6.1.22-2.0.0 branch (v2.8) Update to the 2.8 version aligned with NXP BSP release L6.1.22-2.0.0. Signed-off-by: Chris Dimich --- .../{imx-atf-boundary_2.6.bb => imx-atf-boundary_2.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-bsp/imx-atf/{imx-atf-boundary_2.6.bb => imx-atf-boundary_2.8.bb} (92%) diff --git a/recipes-bsp/imx-atf/imx-atf-boundary_2.6.bb b/recipes-bsp/imx-atf/imx-atf-boundary_2.8.bb similarity index 92% rename from recipes-bsp/imx-atf/imx-atf-boundary_2.6.bb rename to recipes-bsp/imx-atf/imx-atf-boundary_2.8.bb index a5302c6..b8a8fd1 100644 --- a/recipes-bsp/imx-atf/imx-atf-boundary_2.6.bb +++ b/recipes-bsp/imx-atf/imx-atf-boundary_2.8.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 NXP +# Copyright (C) 2017-2023 NXP DESCRIPTION = "i.MX ARM Trusted Firmware" SECTION = "BSP" @@ -9,10 +9,10 @@ PROVIDES = "imx-atf" PV .= "+git${SRCPV}" -SRCBRANCH = "boundary-lf-6.1.1-1.0.0" +SRCBRANCH = "boundary-lf-6.1.22-2.0.0" SRC_URI = "git://github.com/boundarydevices/imx-atf.git;branch=${SRCBRANCH};protocol=https \ " -SRCREV = "b47c5d5f7e87c2b388c10cc5306a651613bccf93" +SRCREV = "7e3484cc10bfc9a53c1e64867b3fb99761f7c375" S = "${WORKDIR}/git" From 3a283aee91fb8ecdb8db185b69fae83d698f416b Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 7 Nov 2023 14:00:47 -0800 Subject: [PATCH 2/2] imx-atf-boundary: unexport variables instead of set in compile task To match imx-atf: https://github.com/Freescale/meta-freescale/blob/master/recipes-bsp/imx-atf/imx-atf_2.8.bb#L29-L33 https://github.com/Freescale/meta-freescale/commit/ad889575ae02de982a47f642db9c9fbfc17c1873 also fixes error: bl31.elf section `coherent_ram' will not fit in region `RAM' aarch64-poky-linux-ld.bfd: BL31 image has exceeded its limit. Signed-off-by: Chris Dimich --- recipes-bsp/imx-atf/imx-atf-boundary_2.8.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-bsp/imx-atf/imx-atf-boundary_2.8.bb b/recipes-bsp/imx-atf/imx-atf-boundary_2.8.bb index b8a8fd1..2399257 100644 --- a/recipes-bsp/imx-atf/imx-atf-boundary_2.8.bb +++ b/recipes-bsp/imx-atf/imx-atf-boundary_2.8.bb @@ -31,6 +31,12 @@ EXTRA_OEMAKE += " \ PLAT=${ATF_PLATFORM} \ " +# Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is a standalone application +CFLAGS[unexport] = "1" +LDFLAGS[unexport] = "1" +AS[unexport] = "1" +LD[unexport] = "1" + BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" do_compile() {