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
This commit is contained in:
Derek
2022-05-29 11:28:54 -04:00
committed by GitHub
parent e8e149ead2
commit 6bf936d2e3
2 changed files with 5 additions and 4 deletions

View File

@@ -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

View File

@@ -189,6 +189,7 @@ compile_uboot()
if [[ -n $ATFSOURCE ]]; then
cp -Rv "${atftempdir}"/*.bin .
cp -Rv "${atftempdir}"/*.elf .
rm -rf "${atftempdir}"
fi