Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5dd73bc0a40a4b318195eab871a1f535aad6b43b

Authored by Stefano Babic
1 parent fa9c021632
Exists in v2017.01-smarct4x and in 48 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

Revert "arm: mxs: Add support for generating signed BootStream" 

This reverts commit 53e6b14e037c9f72e6d03244c32d8d597e2e0234.

Patch does not merge anymore with u-boot-arm and must be rebased.

Signed-off-by: Stefano Babic <sbabic@denx.de>

Showing 3 changed files with 0 additions and 89 deletions Side-by-side Diff

... ... @@ -856,8 +856,6 @@
856 856 u-boot.ais: spl/u-boot-spl.ais u-boot.img FORCE
857 857 $(call if_changed,pad_cat)
858 858  
859   -u-boot-signed.sb: u-boot.bin spl/u-boot-spl.bin
860   - $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs $(objtree)/u-boot-signed.sb
861 859 u-boot.sb: u-boot.bin spl/u-boot-spl.bin
862 860 $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs $(objtree)/u-boot.sb
863 861  
arch/arm/cpu/arm926ejs/mxs/Makefile
Diff comments   View file @ 5dd73bc
... ... @@ -17,85 +17,8 @@
17 17 MKIMAGE_TARGET-$(CONFIG_MX23) = mx23
18 18 MKIMAGE_TARGET-$(CONFIG_MX28) = mx28
19 19  
20   -# Convert hexadecimal value to bytes
21   -define hex2bin
22   -$(shell echo -n "$1" | sed 's/0x//;s/\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/;s/../\\\\x&/g')
23   -endef
24   -
25   -# Compute the post-IVT size field value for the U-Boot binary.
26   -# The value is the result of adding the following:
27   -# -> The size of U-Boot binary aligned to 64B (u-boot.bin)
28   -# -> The size of IVT block aligned to 64B (u-boot.ivt)
29   -# -> The size of U-Boot signature (u-boot.sig), 3904 B
30   -# -> The 64B hole in front of U-Boot binary for 'struct mxs_spl_data' passing
31   -define uboot_ivt_size
32   -$(shell expr `stat -c "%s" $1` + 64 + 3904 + 128 | xargs printf 0x%08x)
33   -endef
34   -
35 20 $(OBJTREE)/mxsimage.cfg: $(SRCTREE)/$(CPUDIR)/$(SOC)/mxsimage.$(MKIMAGE_TARGET-y).cfg
36 21 sed "s@OBJTREE@$(OBJTREE)@g" $^ > $@
37   -
38   -# HAB signature is i.MX28 only
39   -$(OBJTREE)/mxsimage-signed.cfg: $(SRCTREE)/$(CPUDIR)/$(SOC)/mxsimage-signed.cfg
40   - sed "s@OBJTREE@$(OBJTREE)@g" $^ > $@
41   -
42   -$(OBJTREE)/spl/u-boot-spl.ivt: $(OBJTREE)/spl/u-boot-spl.bin
43   - # Align U-Boot SPL binary to 64B
44   - dd if=$^ of=$@ ibs=64 conv=sync 2>/dev/null
45   - mv $@ $^
46   - # Assemble IVT, append size field and align it to 64B.
47   - (echo -ne "$(call hex2bin,0x402000d1)" ; \
48   - echo -ne "$(call hex2bin,$(CONFIG_SPL_TEXT_BASE))" ; \
49   - echo -ne "$(call hex2bin,0x00000000)" ; \
50   - echo -ne "$(call hex2bin,0x00000000)" ; \
51   - echo -ne "$(call hex2bin,0x00000000)" ; \
52   - echo -ne "$(call hex2bin,0x00008000)" ; \
53   - echo -ne "$(call hex2bin,0x00008040)" ; \
54   - echo -ne "$(call hex2bin,0x00000000)" ; \
55   - echo -ne "$(call hex2bin,$(call uboot_ivt_size,$^))" \
56   - ) | dd of=$@ ibs=64 count=1 conv=sync 2>/dev/null
57   -
58   -$(OBJTREE)/u-boot.ivt: $(OBJTREE)/u-boot.bin
59   - # Align U-Boot binary to 64B
60   - dd if=$^ of=$@ ibs=64 conv=sync 2>/dev/null
61   - mv $@ $^
62   - # Assemble IVT, append size field and align it to 64B.
63   - (echo -ne "$(call hex2bin,0x402000d1)" ; \
64   - echo -ne "$(call hex2bin,$(CONFIG_SYS_TEXT_BASE))" ; \
65   - echo -ne "$(call hex2bin,0x00000000)" ; \
66   - echo -ne "$(call hex2bin,0x00000000)" ; \
67   - echo -ne "$(call hex2bin,0x00000000)" ; \
68   - echo -ne "$(call hex2bin,0x40001000)" ; \
69   - echo -ne "$(call hex2bin,0x40001040)" ; \
70   - echo -ne "$(call hex2bin,0x00000000)" ; \
71   - echo -ne "$(call hex2bin,$(call uboot_ivt_size,$^))" \
72   - ) | dd of=$@ ibs=64 count=1 conv=sync 2>/dev/null
73   -
74   -$(OBJTREE)/spl/u-boot-spl.csf: $(OBJTREE)/spl/u-boot-spl.ivt $(OBJTREE)/spl/u-boot-spl.bin $(TOPDIR)/board/$(VENDOR)/$(BOARD)/sign/u-boot-spl.csf
75   - # Assemble the CSF file
76   - sed "s@TOPDIR@$(TOPDIR)@g;s@VENDOR@$(VENDOR)@g;s@BOARD@$(BOARD)@g" \
77   - $(word 3,$^) > $@
78   - sed -i "/^##Blocks.*/ d" $@
79   - echo " Blocks = $(CONFIG_SPL_TEXT_BASE) 0x0 " \
80   - "`stat -c '%s' $(word 2,$^)` \"$(word 2,$^)\" , \\" \
81   - >> $@
82   - echo " 0x8000 0x0 0x40 \"$(word 1,$^)\"" >> $@
83   -
84   -$(OBJTREE)/u-boot.csf: $(OBJTREE)/u-boot.ivt $(OBJTREE)/u-boot.bin $(TOPDIR)/board/$(VENDOR)/$(BOARD)/sign/u-boot.csf
85   - # Assemble the CSF file
86   - sed "s@TOPDIR@$(TOPDIR)@g;s@VENDOR@$(VENDOR)@g;s@BOARD@$(BOARD)@g" \
87   - $(word 3,$^) > $@
88   - sed -i "/^##Blocks.*/ d" $@
89   - echo " Blocks = $(CONFIG_SYS_TEXT_BASE) 0x0 " \
90   - "`stat -c '%s' $(word 2,$^)` \"$(word 2,$^)\" , \\" \
91   - >> $@
92   - echo " 0x40001000 0x0 0x40 \"$(word 1,$^)\"" >> $@
93   -
94   -%.sig: %.csf
95   - cst -o $@ < $^
96   -
97   -$(OBJTREE)/u-boot-signed.sb: $(OBJTREE)/u-boot.ivt $(OBJTREE)/u-boot.sig $(OBJTREE)/spl/u-boot-spl.ivt $(OBJTREE)/spl/u-boot-spl.sig $(OBJTREE)/mxsimage-signed.cfg
98   - $(OBJTREE)/tools/mkimage -n $(OBJTREE)/mxsimage-signed.cfg -T mxsimage $@
99 22  
100 23 $(OBJTREE)/u-boot.sb: $(OBJTREE)/u-boot.bin $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/mxsimage.cfg
101 24 $(OBJTREE)/tools/mkimage -n $(OBJTREE)/mxsimage.cfg -T mxsimage $@
arch/arm/cpu/arm926ejs/mxs/mxsimage-signed.cfg
View file @ 5dd73bc
1   -SECTION 0x0 BOOTABLE
2   - TAG LAST
3   - LOAD 0x1000 OBJTREE/spl/u-boot-spl.bin
4   - LOAD 0x8000 OBJTREE/spl/u-boot-spl.ivt
5   - LOAD 0x8040 OBJTREE/spl/u-boot-spl.sig
6   - CALL HAB 0x8000 0x0
7   - LOAD 0x40002000 OBJTREE/u-boot.bin
8   - LOAD 0x40001000 OBJTREE/u-boot.ivt
9   - LOAD 0x40001040 OBJTREE/u-boot.sig
10   - CALL HAB 0x40001000 0x0