MLK-23625 imx8m: Pad TEE image to align with 16 bytes

When encrypt the boot image with CST tool, it needs each block to align
with 16 bytes. We added the padding to other images except TEE image.
Fix the problem in this patch.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit be382c82)

iMX8M/soc.mak

@@ -134,6 +134,7 @@ clean:
 
 dtbs = fsl-$(PLAT)-evk.dtb
 u-boot.itb: $(dtbs)
+	./$(PAD_IMAGE) tee.bin
 	./$(PAD_IMAGE) bl31.bin
 	./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs)
 	DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs) > u-boot.its
@@ -142,6 +143,7 @@ u-boot.itb: $(dtbs)
 
 dtbs_ddr3l = fsl-$(PLAT)-ddr3l-$(VAL_BOARD).dtb
 u-boot-ddr3l.itb: $(dtbs_ddr3l)
+	./$(PAD_IMAGE) tee.bin
 	./$(PAD_IMAGE) bl31.bin
 	./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr3l)
 	DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs_ddr3l) > u-boot-ddr3l.its
@@ -149,6 +151,7 @@ u-boot-ddr3l.itb: $(dtbs_ddr3l)
 
 dtbs_ddr4 = fsl-$(PLAT)-ddr4-$(VAL_BOARD).dtb
 u-boot-ddr4.itb: $(dtbs_ddr4)
+	./$(PAD_IMAGE) tee.bin
 	./$(PAD_IMAGE) bl31.bin
 	./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr4)
 	DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs_ddr4) > u-boot-ddr4.its
@@ -156,6 +159,7 @@ u-boot-ddr4.itb: $(dtbs_ddr4)
 
 dtbs_ddr4_evk = fsl-$(PLAT)-ddr4-evk.dtb
 u-boot-ddr4-evk.itb: $(dtbs_ddr4_evk)
+	./$(PAD_IMAGE) tee.bin
 	./$(PAD_IMAGE) bl31.bin
 	./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr4_evk)
 	DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs_ddr4_evk) > u-boot-ddr4-evk.its
@@ -232,16 +236,19 @@ flash_dp_spl_uboot: flash_dp_evk
 flash_spl_uboot: flash_evk_no_hdmi
 
 print_fit_hab: u-boot-nodtb.bin bl31.bin $(dtbs)
+	./$(PAD_IMAGE) tee.bin
 	./$(PAD_IMAGE) bl31.bin
 	./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs)
 	TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtbs)
 
 print_fit_hab_ddr4: u-boot-nodtb.bin bl31.bin $(dtbs_ddr4_evk)
+	./$(PAD_IMAGE) tee.bin
 	./$(PAD_IMAGE) bl31.bin
 	./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr4_evk)
 	TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtbs_ddr4_evk)
 
 print_fit_hab_flexspi: u-boot-nodtb.bin bl31.bin $(dtbs)
+	./$(PAD_IMAGE) tee.bin
 	./$(PAD_IMAGE) bl31.bin
 	./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs)
 	TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) BOOT_DEV="flexspi" ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtbs)

scripts/pad_image.sh

 #!/bin/bash
 
 if [ $# -eq 1 ]; then
+	if [ ! -f $1 ]; then
+		echo "Pad file" $1 "NOT found"
+		exit 0
+	fi
 	let size=$(wc -c $1 | awk '{print $1}')
 	let padded_size=$(((size + 15) & ~15))
 
@@ -10,6 +14,14 @@ if [ $# -eq 1 ]; then
 		objcopy -I binary -O binary --pad-to ${padded_size} $1
 	fi
 elif [ $# -eq 2 ]; then
+	if [ ! -f $1 ]; then
+		echo "Pad file" $1 "NOT found"
+		exit 0
+	fi
+	if [ ! -f $2 ]; then
+		echo "Pad file" $2 "NOT found"
+		exit 0
+	fi
 	let size_1=$(wc -c $1 | awk '{print $1}')
 	let size_2=$(wc -c $2 | awk '{print $1}')
 	let padded_size=$(((size_1 + size_2 + 15) & ~15))