Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 714dc001fcd99809f5166b4383343a7b0d16fd6b

Authored by Marek Vasut
Committed by Stefano Babic
1 parent dd3ecf020e
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

arm: mxs: Preprocess u-boot.bd so they contain full path 

The u-boot-imx23.bd and u-boot-imx28.bd need to be preprocessed, otherwise
they have issues with out-of-tree build where elftosb tool couldn't sometimes
find the u-boot.bin and spl/u-boot-spl.bin .

Preprocess these .bd files with sed and insert full path to u-boot.bin and
spl/u-boot-spl.bin to prevent this issue. Moreover, to avoid adding more
churn into main Makefile, move all this preprocessing and u-boot.sb generation
into CPU directory instead.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Showing 5 changed files with 17 additions and 9 deletions Side-by-side Diff

... ... @@ -46,6 +46,7 @@
46 46 /u-boot.ais
47 47 /u-boot.dtb
48 48 /u-boot.sb
  49 +/u-boot.bd
49 50 /u-boot.geany
50 51  
51 52 #
... ... @@ -512,13 +512,9 @@
512 512 cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.img > \
513 513 $(obj)u-boot.ais
514 514  
515   -# Specify the target for use in elftosb call
516   -ELFTOSB_TARGET-$(CONFIG_MX23) = imx23
517   -ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
518 515  
519 516 $(obj)u-boot.sb: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
520   - elftosb -zf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \
521   - -o $(obj)u-boot.sb
  517 + $(MAKE) -C $(SRCTREE)/$(CPUDIR)/$(SOC)/ $(OBJTREE)/u-boot.sb
522 518  
523 519 # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
524 520 # Both images are created using mkimage (crc etc), so that the ROM
... ... @@ -849,6 +845,7 @@
849 845 @rm -f $(obj)u-boot.ais
850 846 @rm -f $(obj)u-boot.dtb
851 847 @rm -f $(obj)u-boot.sb
  848 + @rm -f $(obj)u-boot.bd
852 849 @rm -f $(obj)u-boot.spr
853 850 @rm -f $(obj)nand_spl/{u-boot.{lds,lst},System.map}
854 851 @rm -f $(obj)nand_spl/{u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map}
arch/arm/cpu/arm926ejs/mxs/Makefile
Diff comments   View file @ 714dc00
... ... @@ -40,6 +40,16 @@
40 40 $(LIB): $(OBJS)
41 41 $(call cmd_link_o_target, $(OBJS))
42 42  
  43 +# Specify the target for use in elftosb call
  44 +ELFTOSB_TARGET-$(CONFIG_MX23) = imx23
  45 +ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
  46 +
  47 +$(OBJTREE)/u-boot.bd: $(SRCTREE)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd
  48 + sed "s@OBJTREE@$(OBJTREE)@g" $^ > $@
  49 +
  50 +$(OBJTREE)/u-boot.sb: $(OBJTREE)/u-boot.bin $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/u-boot.bd
  51 + elftosb -zf $(ELFTOSB_TARGET-y) -c $(OBJTREE)/u-boot.bd -o $(OBJTREE)/u-boot.sb
  52 +
43 53 #########################################################################
44 54  
45 55 # defines $(obj).depend target
arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd
Diff comments   View file @ 714dc00
... ... @@ -4,8 +4,8 @@
4 4 }
5 5  
6 6 sources {
7   - u_boot_spl="spl/u-boot-spl.bin";
8   - u_boot="u-boot.bin";
  7 + u_boot_spl="OBJTREE/spl/u-boot-spl.bin";
  8 + u_boot="OBJTREE/u-boot.bin";
9 9 }
10 10  
11 11 section (0) {
arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
Diff comments   View file @ 714dc00
1 1 sources {
2   - u_boot_spl="spl/u-boot-spl.bin";
3   - u_boot="u-boot.bin";
  2 + u_boot_spl="OBJTREE/spl/u-boot-spl.bin";
  3 + u_boot="OBJTREE/u-boot.bin";
4 4 }
5 5  
6 6 section (0) {