From 43daf992a50bcb56c2940766f526d2e580f4bd89 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Thu, 11 Jun 2020 15:17:04 +0100 Subject: [PATCH] trusted-firmware-a: fiptool build using BUILD_CFLAGS and BUILD_LDFLAGS Since the TF-A fiptool is native tool we should be using the BUILD_CFLAGS and BUILD_LDFLAGS flags to proper build and execute it. Change-Id: I9634604dbc42ba7da85d9b9449f1ed94ecb38df2 Issue-Id: SCM-888 Signed-off-by: Diego Sueiro Signed-off-by: Jon Mason --- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index fe9a4e09..e18818a7 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -99,9 +99,8 @@ do_compile() { cd ${S} # These changes are needed to have the fiptool compiling and executing properly - sed -i '/^LDLIBS/ s,$, \-L${RECIPE_SYSROOT_NATIVE}${libdir},' ${S}/tools/fiptool/Makefile - sed -i '/^INCLUDE_PATHS/ s,$, \-I${RECIPE_SYSROOT_NATIVE}${includedir},' ${S}/tools/fiptool/Makefile - export LD_LIBRARY_PATH=${STAGING_DIR_NATIVE}${libdir}:$LD_LIBRARY_PATH + sed -i '/^LDLIBS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile + sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile oe_runmake ${TFA_BUILD_TARGET} }