From 6bf936d2e3eeae8cddadb294ead89d0e1ce89c7d Mon Sep 17 00:00:00 2001 From: Derek Date: Sun, 29 May 2022 11:28:54 -0400 Subject: [PATCH] update atf to 2.6, and don't rename the elf to bin (#3811) * update atf to 2.6, and don't rename the elf to bin * avoid warnings with compiler version 10 --- config/sources/families/include/rockchip64_common.inc | 8 ++++---- lib/compilation.sh | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index f736f83c65..4f408a507b 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -111,14 +111,14 @@ esac prepare_boot_configuration() { if [[ $BOOT_SCENARIO == "blobless" ]]; then - UBOOT_TARGET_MAP="BL31=bl31.bin idbloader.img u-boot.itb;;idbloader.img u-boot.itb" + UBOOT_TARGET_MAP="BL31=bl31.elf idbloader.img u-boot.itb;;idbloader.img u-boot.itb" ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware' ATF_COMPILER='aarch64-linux-gnu-' ATFDIR='arm-trusted-firmware' - ATFBRANCH='tag:v2.5' + ATFBRANCH='tag:v2.6' 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.bin" - ATF_TOOLCHAIN2="arm-linux-gnueabi-:> 5.0" + 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" elif [[ $BOOT_SCENARIO == "tpl-spl-blob" ]]; then diff --git a/lib/compilation.sh b/lib/compilation.sh index 23c47ce14c..024a94bd4e 100644 --- a/lib/compilation.sh +++ b/lib/compilation.sh @@ -189,6 +189,7 @@ compile_uboot() if [[ -n $ATFSOURCE ]]; then cp -Rv "${atftempdir}"/*.bin . + cp -Rv "${atftempdir}"/*.elf . rm -rf "${atftempdir}" fi