Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 74752baa738ee9dafe69d726910e26da56f6f722

Authored by Scott Wood
Committed by Kim Phillips
1 parent ebbf0d20aa
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

spl: Change PAD_TO to CONFIG_SPL_PAD_TO 

This was already used by some SPL targets, and allows the pad amount to
be specified by board config headers rather than only in makefile
fragments.

Also supply a pad-to of zero if the variable is undefined.  It works
without this, but this avoids relying on undocumented behavior.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

Showing 3 changed files with 10 additions and 2 deletions Side-by-side Diff

... ... @@ -485,8 +485,12 @@
485 485 $(obj)u-boot.dis: $(obj)u-boot
486 486 $(OBJDUMP) -d $< > $@
487 487  
  488 +
  489 +
488 490 $(obj)u-boot-with-spl.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
489   - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
  491 + $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(or $(CONFIG_SPL_PAD_TO),0) \
  492 + -O binary $(obj)spl/u-boot-spl \
  493 + $(obj)spl/u-boot-spl-pad.bin
490 494 cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@
491 495 rm $(obj)spl/u-boot-spl-pad.bin
492 496  
... ... @@ -2836,6 +2836,10 @@
2836 2836 CONFIG_SPL_LIBGENERIC_SUPPORT
2837 2837 Support for lib/libgeneric.o in SPL binary
2838 2838  
  2839 + CONFIG_SPL_PAD_TO
  2840 + Linker address to which the SPL should be padded before
  2841 + appending the SPL payload.
  2842 +
2839 2843 CONFIG_SPL_TARGET
2840 2844 Final target image containing SPL and payload. Some SPLs
2841 2845 use an arch-specific makefile fragment instead, for
board/ait/cam_enc_4xx/config.mk
Diff comments   View file @ 74752ba
... ... @@ -8,7 +8,7 @@
8 8 #
9 9  
10 10 #Provide at least 16MB spacing between us and the Linux Kernel image
11   -PAD_TO := 12320
  11 +CONFIG_SPL_PAD_TO := 12320
12 12 UBL_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/ublimage.cfg
13 13 ifndef CONFIG_SPL_BUILD
14 14 ALL-y += $(obj)u-boot.ubl