Eric Lee / smarc-uboot

Download as
Browse Code »

Commit ba5976092fc6b5d98397fe86627d7cca0fee9c99

Authored by Benoît Thébaudeau
Committed by Albert ARIBAUD
1 parent 600ed32152
Exists in master and in 53 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, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, 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, v2017.01-smarct4x

imx: Add u-boot-with-spl.imx make target 

This image combines the SPL with the i.MX header and U-Boot. This is a
convenient way of having a single image to program on some boot devices.

The i.MX header has to be added to the SPL before appending U-Boot, so that the
boot ROM loads only the SPL.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>

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

... ... @@ -30,6 +30,7 @@
30 30 /u-boot
31 31 /u-boot.hex
32 32 /u-boot.imx
  33 +/u-boot-with-spl.imx
33 34 /u-boot.map
34 35 /u-boot.srec
35 36 /u-boot.ldr
... ... @@ -486,6 +486,10 @@
486 486 cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@
487 487 rm $(obj)spl/u-boot-spl-pad.bin
488 488  
  489 +$(obj)u-boot-with-spl.imx: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
  490 + $(MAKE) -C $(SRCTREE)/arch/arm/imx-common \
  491 + $(OBJTREE)/u-boot-with-spl.imx
  492 +
489 493 $(obj)u-boot.ubl: $(obj)u-boot-with-spl.bin
490 494 $(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \
491 495 -e $(CONFIG_SYS_TEXT_BASE) -d $< $(obj)u-boot.ubl
... ... @@ -850,6 +854,7 @@
850 854 @rm -f $(obj)u-boot.kwb
851 855 @rm -f $(obj)u-boot.pbl
852 856 @rm -f $(obj)u-boot.imx
  857 + @rm -f $(obj)u-boot-with-spl.imx
853 858 @rm -f $(obj)u-boot.ubl
854 859 @rm -f $(obj)u-boot.ais
855 860 @rm -f $(obj)u-boot.dtb
arch/arm/imx-common/Makefile
Diff comments   View file @ ba59760
... ... @@ -55,6 +55,12 @@
55 55 $(OBJTREE)/tools/mkimage -n $(filter-out %.bin,$^) -T imximage \
56 56 -e $(CONFIG_SPL_TEXT_BASE) -d $< $@
57 57  
  58 +$(OBJTREE)/u-boot-with-spl.imx: $(OBJTREE)/SPL $(OBJTREE)/u-boot.bin
  59 + $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SPL_PAD_TO) \
  60 + -I binary -O binary $< $(OBJTREE)/spl/u-boot-spl-pad.imx
  61 + cat $(OBJTREE)/spl/u-boot-spl-pad.imx $(OBJTREE)/u-boot.bin > $@
  62 + rm $(OBJTREE)/spl/u-boot-spl-pad.imx
  63 +
58 64  
59 65 #########################################################################
60 66