zynqmp: Generate u-boot.its also with TEE dynamically

The first change is to trying to find out TF-A load address based on
reading elf file. Expectation is that bl31.bin is in the same folder as
bl31.elf. It brings new flexibility to place TF-A to any address (DDR
included).

And also enable TEE generation also with TEE configuration.
Expecation is the same as above that tee.bin and tee.elf are in the same
folder.

User has to just define link to BL31/BL32 binary files and the rest should
be handled by the script.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh
index 92e31849f88d3bb593178de035826df6a8634a16..700871dbe109fbe154d44fad238e0b6091c49668 100755 (executable)
--- a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh
+++ b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh
@@ -8,9 +8,19 @@
 
 BL33="u-boot-nodtb.bin"
 [ -z "$BL31" ] && BL31="bl31.bin"
-# Can be also done as ${CROSS_COMPILE}readelf -l bl31.elf | awk '/Entry point/ { print $3 }'
+BL31_ELF="${BL31%.*}.elf"
+[ -f ${BL31_ELF} ] && ATF_LOAD_ADDR=`${CROSS_COMPILE}readelf -l "${BL31_ELF}" | \
+awk '/Entry point/ { print $3 }'`
+
 [ -z "$ATF_LOAD_ADDR" ] && ATF_LOAD_ADDR="0xfffea000"
 
+[ -z "$BL32" ] && BL32="tee.bin"
+BL32_ELF="${BL32%.*}.elf"
+[ -f ${BL32_ELF} ] && TEE_LOAD_ADDR=`${CROSS_COMPILE}readelf -l "${BL32_ELF}" | \
+awk '/Entry point/ { print $3 }'`
+
+[ -z "$TEE_LOAD_ADDR" ] && TEE_LOAD_ADDR="0x60000000"
+
 if [ -z "$BL33_LOAD_ADDR" ];then
        BL33_LOAD_ADDR=`awk '/CONFIG_SYS_TEXT_BASE/ { print $3 }' include/generated/autoconf.h`
 fi
@@ -75,6 +85,24 @@ cat << __ATF
 __ATF
 fi
 
+if [ -f $BL32 ]; then
+cat << __TEE
+               tee {
+                       description = "TEE firmware";
+                       data = /incbin/("$BL32");
+                       type = "firmware";
+                       os = "tee";
+                       arch = "arm64";
+                       compression = "none";
+                       load = <$TEE_LOAD_ADDR>;
+                       entry = <$TEE_LOAD_ADDR>;
+                       hash {
+                               algo = "md5";
+                       };
+               };
+__TEE
+fi
+
 DEFAULT=1
 cnt=1
 for dtname in $DT
@@ -117,6 +145,16 @@ cat << __CONF_SECTION1_EOF
                };
 __CONF_SECTION1_EOF
 else
+if [ -f $BL32 ]; then
+cat << __CONF_SECTION1_EOF
+               config_$cnt {
+                       description = "$(basename $dtname .dtb)";
+                       firmware = "atf";
+                       loadables = "uboot", "tee";
+                       fdt = "fdt_$cnt";
+               };
+__CONF_SECTION1_EOF
+else
 cat << __CONF_SECTION1_EOF
                config_$cnt {
                        description = "$(basename $dtname .dtb)";
@@ -126,6 +164,7 @@ cat << __CONF_SECTION1_EOF
                };
 __CONF_SECTION1_EOF
 fi
+fi
 
 cnt=$((cnt+1))
 done