1 files changed, 7 insertions, 5 deletions

diff --git a/recipes-bsp/imx-atf/imx-atf_2.6.bb b/recipes-bsp/imx-atf/imx-atf_2.6.bb
index 1df61cab8..3f627150b 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.6.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.6.bb
@@ -7,8 +7,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m
 
 PV .= "+git${SRCPV}"
 
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
-           file://0001-Makefile-Suppress-array-bounds-error.patch"
+SRC_URI = " \
+    git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
+    file://0001-Makefile-Suppress-array-bounds-error.patch \
+    file://rwx-segments.patch \
+"
 SRCBRANCH = "lf_v2.6"
 SRCREV = "c6a19b1a351308cc73443283f6aa56b2eff791b8"
 
@@ -29,9 +32,7 @@ EXTRA_OEMAKE += " \
 
 # Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is a standalone application
 CFLAGS[unexport] = "1"
-# Needed for binutils >= 2.39 to prevent build failure.
-# imx-atf links with ld, thus no '-Wl,' prefix
-LDFLAGS = "--no-warn-rwx-segments"
+LDFLAGS[unexport] = "1"
 AS[unexport] = "1"
 LD[unexport] = "1"
 
@@ -58,6 +59,7 @@ EXTRA_OEMAKE += 'IMX_BOOT_UART_BASE=${ATF_BOOT_UART_BASE}'
 do_configure[noexec] = "1"
 
 do_compile() {
+    # Clear LDFLAGS to avoid the option -Wl recognize issue
     oe_runmake bl31
     if ${BUILD_OPTEE}; then
         oe_runmake clean BUILD_BASE=build-optee