From c7034bb57b045c0b6d4fb9180abe42a96f4d1add Mon Sep 17 00:00:00 2001 From: Ganga Ram Date: Fri, 11 Apr 2025 12:37:15 +0400 Subject: [PATCH] Fix compilation issue Updated makeFlags as latest buildArmTrustedFirmware specifies CC and LD explicitly, which doesn't work well with the nxp imx8mp-evk platform. Signed-off-by: Ganga Ram --- nxp/imx8mp-evk/bsp/imx8mp-atf.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nxp/imx8mp-evk/bsp/imx8mp-atf.nix b/nxp/imx8mp-evk/bsp/imx8mp-atf.nix index 55454c4a..84e921f6 100644 --- a/nxp/imx8mp-evk/bsp/imx8mp-atf.nix +++ b/nxp/imx8mp-evk/bsp/imx8mp-atf.nix @@ -25,10 +25,16 @@ in sha256 = "sha256-96EddJXlFEkP/LIGVgNBvUP4IDI3BbDE/c9Yub22gnc="; }; - extraMakeFlags = lib.concatLists [ - (lib.optional (lib.versionAtLeast pkgs.binutils.version "2.39") "LDFLAGS=--no-warn-rwx-segments") - ["PLAT=${platform}" "bl31" "${opteedflag}"] - ]; + makeFlags = [ + "HOSTCC=$(CC_FOR_BUILD)" + "M0_CROSS_COMPILE=arm-none-eabi-" + "CROSS_COMPILE=aarch64-unknown-linux-gnu-" + # binutils 2.39 regression + # `warning: /build/source/build/rk3399/release/bl31/bl31.elf has a LOAD segment with RWX permissions` + # See also: https://developer.trustedfirmware.org/T996 + "LDFLAGS=-no-warn-rwx-segments" + "PLAT=${platform}" "bl31" "${opteedflag}" + ]; filesToInstall = ["build/${target-board}/release/bl31.bin"]; }