diff options
Diffstat (limited to 'recipes-bsp/imx-atf/imx-atf_2.4.bb')
| -rw-r--r-- | recipes-bsp/imx-atf/imx-atf_2.4.bb | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/recipes-bsp/imx-atf/imx-atf_2.4.bb b/recipes-bsp/imx-atf/imx-atf_2.4.bb index 8360bfa8..39158e6c 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.4.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.4.bb @@ -5,12 +5,14 @@ SECTION = "BSP" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + PV .= "+git${SRCPV}" SRCBRANCH = "lf_v2.4" SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ -" -SRCREV = "bb4957067d4b96a6ee197a333425948e409e990d" + file://0001-Makefile-Suppress-array-bounds-error.patch" +SRCREV = "05f788b9bbb13d002997e35008a4b945f7e2957b" S = "${WORKDIR}/git" @@ -25,13 +27,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 @@ -50,4 +69,4 @@ do_deploy() { addtask deploy after do_compile PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8|imx-boot-container)" +COMPATIBLE_MACHINE = "(mx8-generic-bsp)" |