summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorHaixiang Bao <haixiang.bao@amlogic.com>2015-06-02 17:20:30 +0800
committerHaixiang Bao <haixiang.bao@amlogic.com>2015-06-02 17:20:30 +0800
commitd71d3bbefccc86c472c858225a2ade886dddbe2e (patch)
treeaff35811d30fab7797b33666fdfdc4b851b2985d /Makefile
parent852d612a0d43045a825b7a5467754a9071da8e6b (diff)
downloadu-boot-odroid-c1-d71d3bbefccc86c472c858225a2ade886dddbe2e.tar.gz
GXBB : code clean up for secure boot
1. this commit based on following commit http://10.8.9.5/uboot/commit/?h=next-2015-dev& id=852d612a0d43045a825b7a5467754a9071da8e6b 2. remove /tools/gx_boot (replaced with aml_encrypt_gxb) 3. update Makefile for bootloader image generate 4. bug fix : nand read function open Change-Id: I3fef8e5b180ec3a0dc20d2000896c326107915d1 Signed-off-by: Haixiang Bao <haixiang.bao@amlogic.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index b115fcfda9..129d86446b 100644
--- a/Makefile
+++ b/Makefile
@@ -892,17 +892,13 @@ boot.bin: bl2.bin bl301.bin fip.bin
else
boot.bin: bl2.bin fip.bin
endif
- $(Q)$(srctree)/tools/gx_boot pkg $(FIP_FOLDER)/bl2.bin
- $(Q)$(srctree)/tools/gx_boot spl $(FIP_FOLDER)/bl2_fix.bin $(FIP_FOLDER)/bl2.bin.pkg
- $(Q)cat $(FIP_FOLDER)/bl2_fix.bin $(FIP_FOLDER)/fip.bin > $(FIP_FOLDER)/boot.bin
- $(Q)$(FIP_FOLDER)/boot_sd.sh $(FIP_FOLDER)/blank_512 $(FIP_FOLDER)/boot.bin $(FIP_FOLDER)/boot_sd.bin
$(Q)$(FIP_FOLDER)/bl2_fix.sh $(FIP_FOLDER)/bl2.bin $(FIP_FOLDER)/zero_tmp $(FIP_FOLDER)/bl2_new.bin
$(Q)cat $(FIP_FOLDER)/bl2_new.bin $(FIP_FOLDER)/fip.bin > $(FIP_FOLDER)/boot_new.bin
$(Q)$(FIP_FOLDER)/aml_encrypt_$(SOC) --bootsig --input $(FIP_FOLDER)/boot_new.bin --output $(FIP_FOLDER)/u-boot.bin
ifeq ($(CONFIG_AML_CRYPTO_UBOOT), y)
$(Q)$(FIP_FOLDER)/aml_encrypt_$(SOC) --bootsig --input $(FIP_FOLDER)/boot_new.bin --amluserkey $(srctree)/board/$(BOARDDIR)/aml-user-key.sig --aeskey enable --output $(FIP_FOLDER)/u-boot.bin.encrypt
- @rm -f $(FIP_FOLDER)/bl2_new.bin $(FIP_FOLDER)/boot_new.bin
endif
+ @rm -f $(FIP_FOLDER)/bl2_new.bin $(FIP_FOLDER)/boot_new.bin
@echo '$(FIP_FOLDER)/u-boot.bin build done!'
#
@@ -1414,11 +1410,8 @@ distclean: mrproper
@rm -f $(srctree)/fip/bl301.bin
@rm -f $(srctree)/fip/bl33.bin
@rm -f $(srctree)/fip/fip.bin
- @rm -f $(srctree)/fip/bl2_fix.bin
- @rm -f $(srctree)/fip/boot.bin
- @rm -f $(srctree)/fip/boot_sd.bin
- @rm -f $(srctree)/fip/bl2.bin.pkg
@rm -f $(srctree)/fip/u-boot.bin
+ @rm -f $(srctree)/fip/u-boot.bin.*
backup:
F=`basename $(srctree)` ; cd .. ; \