aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2021-12-03 17:31:18 -0300
committerGitHub <noreply@github.com>2021-12-03 17:31:18 -0300
commit58a442bdafae4329a61f656d597c76c5fb8da928 (patch)
tree108b636e78d03c291f9509dc3825d2bb4fdd3175
parentd70adb5df845c1adb35335a3fabebf54fcee43a0 (diff)
parentd9fb91b0f1e0c0f894ec4ace9ae293d36da3f349 (diff)
downloadmeta-freescale-master.zip
meta-freescale-master.tar.gz
meta-freescale-master.tar.bz2
Merge pull request #933 from zandrey/imx-atf-improvementsHEADmaster
imx-atf improvements (Clang ready)
-rw-r--r--recipes-bsp/imx-atf/imx-atf_2.4.bb21
1 files changed, 19 insertions, 2 deletions
diff --git a/recipes-bsp/imx-atf/imx-atf_2.4.bb b/recipes-bsp/imx-atf/imx-atf_2.4.bb
index 8360bfa..ce30822 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.4.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.4.bb
@@ -25,13 +25,30 @@ 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"
+
+# Baremetal, just need a compiler
+DEPENDS:remove = "virtual/${TARGET_PREFIX}compilerlibs virtual/libc"
+
BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
-CFLAGS:remove:mx8mq = "-O2"
+# CC and LD introduce arguments which conflict with those otherwise provided by
+# this recipe. The heads of these variables excluding those arguments
+# are therefore used instead.
+def remove_options_tail (in_string):
+ from itertools import takewhile
+ return ' '.join(takewhile(lambda x: not x.startswith('-'), in_string.split(' ')))
+
+EXTRA_OEMAKE += "LD=${@remove_options_tail(d.getVar('LD'))}"
+
+EXTRA_OEMAKE += "CC=${@remove_options_tail(d.getVar('CC'))}"
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