Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm64: zynqmp: Add support for u-boot.itb generation without ATF

Browse source 
If ATF doesn't exist generate u-boot.itb without it and let U-Boot run in
EL3. Still keep warning to let user know that ATF/BL31 is missing.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2020-03-23 14:40:52 +01:00
parent 3d03752475
commit b8c3d3f45f
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/arm/mach-zynqmp/mkimage_fit_atf.sh
View file

@ -29,11 +29,8 @@ else
fi fi
if [ ! -f $BL31 ]; then if [ ! -f $BL31 ]; then
echo "WARNING: BL31 file $BL31 NOT found, resulting binary is non-functional" >&2 echo "WARNING: BL31 file $BL31 NOT found, U-Boot will run in EL3" >&2
BL31=/dev/null BL31=/dev/null
# But U-Boot proper could be loaded in EL3 by specifying
# firmware = "uboot";
# instead of "atf" in config node
fi fi
cat << __HEADER_EOF cat << __HEADER_EOF
@ -58,6 +55,10 @@ cat << __HEADER_EOF
algo = "md5"; algo = "md5";
}; };
}; };
__HEADER_EOF
if [ -f $BL31 ]; then
cat << __ATF
atf { atf {
description = "ARM Trusted Firmware"; description = "ARM Trusted Firmware";
data = /incbin/("$BL31"); data = /incbin/("$BL31");
@ -71,7 +72,8 @@ cat << __HEADER_EOF
algo = "md5"; algo = "md5";
}; };
}; };
__HEADER_EOF __ATF
fi
DEFAULT=1 DEFAULT=1
cnt=1 cnt=1
@ -106,6 +108,15 @@ __CONF_HEADER_EOF
cnt=1 cnt=1
for dtname in $DT for dtname in $DT
do do
if [ ! -f $BL31 ]; then
cat << __CONF_SECTION1_EOF
config_$cnt {
description = "$(basename $dtname .dtb)";
firmware = "uboot";
fdt = "fdt_$cnt";
};
__CONF_SECTION1_EOF
else
cat << __CONF_SECTION1_EOF cat << __CONF_SECTION1_EOF
config_$cnt { config_$cnt {
description = "$(basename $dtname .dtb)"; description = "$(basename $dtname .dtb)";
@ -114,6 +125,8 @@ cat << __CONF_SECTION1_EOF
fdt = "fdt_$cnt"; fdt = "fdt_$cnt";
}; };
__CONF_SECTION1_EOF __CONF_SECTION1_EOF
fi
cnt=$((cnt+1)) cnt=$((cnt+1))
done done