From 204c646cc676848f8af2da38b39829cf9fe9dfa1 Mon Sep 17 00:00:00 2001 From: Werner Date: Thu, 17 Apr 2025 07:21:22 +0000 Subject: [PATCH] rockchip64: fix atf build, bump ATF to latest tag --- config/sources/families/include/rockchip64_common.inc | 2 +- lib/functions/compilation/atf.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index ff10d70070..b2be213df1 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -166,7 +166,7 @@ prepare_boot_configuration() { ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware' ATF_COMPILER='aarch64-linux-gnu-' ATFDIR='arm-trusted-firmware' - ATFBRANCH='tag:v2.12.0' + ATFBRANCH='tag:lts-v2.12.1' ATF_USE_GCC='> 6.3' ATF_TARGET_MAP="M0_CROSS_COMPILE=arm-linux-gnueabi- PLAT=$BOOT_SOC bl31;;build/$BOOT_SOC/release/bl31/bl31.elf:bl31.elf" ATF_TOOLCHAIN2="arm-linux-gnueabi-:< 10.0" diff --git a/lib/functions/compilation/atf.sh b/lib/functions/compilation/atf.sh index 674a979c2e..2c6b55408b 100644 --- a/lib/functions/compilation/atf.sh +++ b/lib/functions/compilation/atf.sh @@ -71,7 +71,7 @@ compile_atf() { display_alert "Binutils version for ATF" "${binutils_version}" "info" if linux-version compare "${binutils_version}" ge "2.39"; then display_alert "Binutils version for ATF" ">= 2.39, adding --no-warn-rwx-segment" "info" - binutils_flags_atf="--no-warn-rwx-segment" + binutils_flags_atf="-Wl,--no-warn-rwx-segment" fi # - ENABLE_BACKTRACE="0" has been added to workaround a regression in ATF. Check: https://github.com/armbian/build/issues/1157