PD#120759: Merge bl30/bl301

Verified pass on p200/p201/gxtvbb_skt

BL30 commit a3c2bc0999085c6549d125dfbc031a17dd5b1b42
Author: Xiaobo Gu <xiaobo.gu@amlogic.com>
Date:   Tue Mar 8 17:05:18 2016 +0800

    PD#120759: Merge BL30 and BL301.

      a). remove get_bl301_code step.

Change-Id: Id9d34e60995708bb96a771fc5f3425cc6fb767ce

Makefile

@@ -860,10 +860,11 @@ else #SUPPORT_CUSOTMER_BOARD
 FIP_FOLDER := $(srctree)/fip
 endif #SUPPORT_CUSOTMER_BOARD
 FIP_FOLDER_SOC := $(FIP_FOLDER)/$(SOC)
-FIP_ARGS += --bl30 $(FIP_FOLDER_SOC)/bl30.bin
-ifeq ($(CONFIG_NEED_BL301), y)
-FIP_ARGS += --bl301 $(FIP_FOLDER_SOC)/bl301.bin
-endif
+FIP_ARGS += --bl30 $(FIP_FOLDER_SOC)/bl30_new.bin
+#remove bl301
+#ifeq ($(CONFIG_NEED_BL301), y)
+#FIP_ARGS += --bl301 $(FIP_FOLDER_SOC)/bl301.bin
+#endif
 ifeq ($(CONFIG_FIP_IMG_SUPPORT), y)
 BL3X_SUFFIX := img
 else
@@ -885,6 +886,7 @@ else
 fip.bin: tools prepare acs.bin
 endif
 	$(Q)cp u-boot.bin $(FIP_FOLDER_SOC)/bl33.bin
+	@rm -f $(FIP_FOLDER_SOC)/fip.bin
 	$(Q)$(FIP_FOLDER)/fip_create ${FIP_ARGS} $(FIP_FOLDER_SOC)/fip.bin
 	$(Q)$(FIP_FOLDER)/fip_create --dump $(FIP_FOLDER_SOC)/fip.bin
 
@@ -893,6 +895,14 @@ ifeq ($(CONFIG_NEED_BL301), y)
 bl301.bin: tools prepare acs.bin bl21.bin
 	$(Q)$(MAKE) -C $(srctree)/$(CPUDIR)/${SOC}/firmware/scp_task
 	$(Q)cp $(buildtree)/scp_task/bl301.bin $(FIP_FOLDER_SOC)/bl301.bin -f
+	$(Q)$(FIP_FOLDER)/blx_fix.sh \
+		$(FIP_FOLDER_SOC)/bl30.bin \
+		$(FIP_FOLDER_SOC)/zero_tmp \
+		$(FIP_FOLDER_SOC)/bl30_zero.bin \
+		$(FIP_FOLDER_SOC)/bl301.bin \
+		$(FIP_FOLDER_SOC)/bl301_zero.bin \
+		$(FIP_FOLDER_SOC)/bl30_new.bin \
+		bl30
 endif
 
 .PHONY : acs.bin
@@ -912,7 +922,14 @@ ifeq ($(CONFIG_AML_UBOOT_AUTO_TEST), y)
 else
 	$(Q)python $(FIP_FOLDER)/acs_tool.pyc $(FIP_FOLDER_SOC)/bl2.bin $(FIP_FOLDER_SOC)/bl2_acs.bin $(FIP_FOLDER_SOC)/acs.bin 0
 endif
-	$(Q)$(FIP_FOLDER)/bl2_fix.sh $(FIP_FOLDER_SOC)/bl2_acs.bin $(FIP_FOLDER_SOC)/zero_tmp $(FIP_FOLDER_SOC)/bl2_zero.bin $(FIP_FOLDER_SOC)/bl21.bin $(FIP_FOLDER_SOC)/bl21_zero.bin $(FIP_FOLDER_SOC)/bl2_new.bin
+	$(Q)$(FIP_FOLDER)/blx_fix.sh \
+		$(FIP_FOLDER_SOC)/bl2_acs.bin \
+		$(FIP_FOLDER_SOC)/zero_tmp \
+		$(FIP_FOLDER_SOC)/bl2_zero.bin \
+		$(FIP_FOLDER_SOC)/bl21.bin \
+		$(FIP_FOLDER_SOC)/bl21_zero.bin \
+		$(FIP_FOLDER_SOC)/bl2_new.bin \
+		bl2
 	$(Q)cat $(FIP_FOLDER_SOC)/bl2_new.bin  $(FIP_FOLDER_SOC)/fip.bin > $(FIP_FOLDER_SOC)/boot_new.bin
 	$(Q)$(FIP_FOLDER_SOC)/aml_encrypt_$(SOC) --bootsig --input $(FIP_FOLDER_SOC)/boot_new.bin --output $(FIP_FOLDER_SOC)/u-boot.bin
 ifeq ($(CONFIG_AML_CRYPTO_UBOOT), y)

fip/blx_fix.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+#bl2 file size 41K, bl21 file size 3K (file size not equal runtime size)
+#total 44K
+#after encrypt process, bl2 add 4K header, cut off 4K tail
+
+#bl30 limit 41K
+#bl301 limit 12K
+#bl2 limit 41K
+#bl21 limit 3K, but encrypt tool need 48K bl2.bin, so fix to 7168byte.
+
+#$7:name flag
+if [ "$7" = "bl30" ]; then
+	declare blx_bin_limit=41984
+	declare blx01_bin_limit=12228
+elif [ "$7" = "bl2" ]; then
+	declare blx_bin_limit=41984
+	declare blx01_bin_limit=7168
+else
+	echo "blx_fix name flag not supported!"
+	exit 1
+fi
+
+# blx_size: blx.bin size, zero_size: fill with zeros
+declare -i blx_size=`du -b $1 | awk '{print int($1)}'`
+declare -i zero_size=$blx_bin_limit-$blx_size
+dd if=/dev/zero of=$2 bs=1 count=$zero_size
+cat $1 $2 > $3
+rm $2
+
+declare -i blx01_size=`du -b $4 | awk '{print int($1)}'`
+declare -i zero_size_01=$blx01_bin_limit-$blx01_size
+dd if=/dev/zero of=$2 bs=1 count=$zero_size_01
+cat $4 $2 > $5
+
+cat $3 $5 > $6
+
+rm $2
+
+exit 0

mk

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-make SOC=gxb distclean
+make distclean
 make $1'_config'
 make -j