bump arm trusted firmware to 2.12 for rockchip64

This commit is contained in:
Tim Surber
2025-01-03 16:12:07 +01:00
committed by Igor
parent 8c20a470a4
commit 7c5f95ef8c
2 changed files with 4 additions and 4 deletions

View File

@@ -162,7 +162,7 @@ prepare_boot_configuration() {
ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
ATF_COMPILER='aarch64-linux-gnu-'
ATFDIR='arm-trusted-firmware'
ATFBRANCH='tag:lts-v2.8.8'
ATFBRANCH='tag:v2.12.0'
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"

View File

@@ -73,12 +73,12 @@ compile_atf() {
display_alert "Binutils version for ATF" ">= 2.39, adding --no-warn-rwx-segment" "info"
binutils_flags_atf="--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
run_host_command_logged CCACHE_BASEDIR="$(pwd)" PATH="${toolchain}:${toolchain2}:${PATH}" \
run_host_command_logged "CROSS_COMPILE='ccache ${ATF_COMPILER}'" CCACHE_BASEDIR="$(pwd)" "CC='ccache ${ATF_COMPILER}gcc'" PATH="${toolchain}:${toolchain2}:${PATH}" \
"CFLAGS='-fdiagnostics-color=always -Wno-error=attributes -Wno-error=incompatible-pointer-types'" \
"TF_LDFLAGS='${binutils_flags_atf}'" \
make ENABLE_BACKTRACE="0" LOG_LEVEL="40" BUILD_STRING="armbian" $target_make "${CTHREADS}" "CROSS_COMPILE='$CCACHE $ATF_COMPILER'"
make ENABLE_BACKTRACE="0" LOG_LEVEL="40" BUILD_STRING="armbian" $target_make "${CTHREADS}"
# @TODO: severely missing logging
[[ $(type -t atf_custom_postprocess) == function ]] && atf_custom_postprocess 2>&1