From ad889575ae02de982a47f642db9c9fbfc17c1873 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Fri, 3 Dec 2021 09:54:30 +0000 Subject: imx_atf: unexport variables instead of set in compile task CFLAGS, LDFLAGS, AS and LD variables are defined in TF-A Makefile and are dependent on the target build. Unexport those flags from build so they can be picked up by TF-A in a form it is defined in Makefile and not provided by OE build. Signed-off-by: Andrey Zhizhikin Cc: Tom Hochstein --- recipes-bsp/imx-atf/imx-atf_2.4.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'recipes-bsp/imx-atf') diff --git a/recipes-bsp/imx-atf/imx-atf_2.4.bb b/recipes-bsp/imx-atf/imx-atf_2.4.bb index 8360bfa8..965e0948 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.4.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.4.bb @@ -25,13 +25,16 @@ EXTRA_OEMAKE += " \ PLAT=${ATF_PLATFORM} \ " -BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" +# 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" -CFLAGS:remove:mx8mq = "-O2" +BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" do_compile() { # Clear LDFLAGS to avoid the option -Wl recognize issue - unset LDFLAGS oe_runmake bl31 if ${BUILD_OPTEE}; then oe_runmake clean BUILD_BASE=build-optee -- cgit v1.2.3-54-g00ecf