Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 630d23455bf01ef92dba41589fdb338984717f2f

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 4e0c8abcdd
Exists in master and in 50 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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, v2017.01-smarct4x

kbuild: refactor more IMX image rules 

This commit avoids generating ./SPL twice.
  - Fist time descending to spl/
  - Second time as a prerequisite of u-boot-with-spl.imx,
    u-boot-with-nand-spl.imx.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Showing 6 changed files with 14 additions and 34 deletions Side-by-side Diff

... ... @@ -839,7 +839,10 @@
839 839 tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin FORCE
840 840 $(call if_changed,pad_cat)
841 841  
842   -u-boot-with-spl.imx u-boot-with-nand-spl.imx: spl/u-boot-spl.bin u-boot.bin
  842 +SPL: spl/u-boot-spl.bin FORCE
  843 + $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
  844 +
  845 +u-boot-with-spl.imx u-boot-with-nand-spl.imx: SPL u-boot.bin FORCE
843 846 $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
844 847  
845 848 MKIMAGEFLAGS_u-boot.ubl = -n $(UBL_CONFIG) -T ublimage -e $(CONFIG_SYS_TEXT_BASE)
... ... @@ -112,4 +112,14 @@
112 112 else
113 113 OBJCOPYFLAGS += -j .text -j .rodata -j .hash -j .data -j .got.plt -j .u_boot_list -j .rel.dyn
114 114 endif
  115 +
  116 +ifneq ($(CONFIG_IMX_CONFIG),)
  117 +ifdef CONFIG_SPL
  118 +ifndef CONFIG_SPL_BUILD
  119 +ALL-y += SPL
  120 +endif
  121 +else
  122 +ALL-y += u-boot.imx
  123 +endif
  124 +endif
arch/arm/cpu/arm1136/config.mk
Diff comments   View file @ 630d234
... ... @@ -7,14 +7,4 @@
7 7  
8 8 # Make ARMv5 to allow more compilers to work, even though its v6.
9 9 PLATFORM_CPPFLAGS += -march=armv5
10   -
11   -ifneq ($(CONFIG_IMX_CONFIG),)
12   -ifdef CONFIG_SPL
13   -ifdef CONFIG_SPL_BUILD
14   -ALL-y += SPL
15   -endif
16   -else
17   -ALL-y += u-boot.imx
18   -endif
19   -endif
arch/arm/cpu/arm926ejs/config.mk
Diff comments   View file @ 630d234
... ... @@ -6,14 +6,4 @@
6 6 #
7 7  
8 8 PLATFORM_CPPFLAGS += -march=armv5te
9   -
10   -ifneq ($(CONFIG_IMX_CONFIG),)
11   -ifdef CONFIG_SPL
12   -ifdef CONFIG_SPL_BUILD
13   -ALL-y += SPL
14   -endif
15   -else
16   -ALL-y += u-boot.imx
17   -endif
18   -endif
arch/arm/cpu/armv7/config.mk
Diff comments   View file @ 630d234
... ... @@ -13,14 +13,4 @@
13 13 # SEE README.arm-unaligned-accesses
14 14 PF_NO_UNALIGNED := $(call cc-option, -mno-unaligned-access,)
15 15 PLATFORM_NO_UNALIGNED := $(PF_NO_UNALIGNED)
16   -
17   -ifneq ($(CONFIG_IMX_CONFIG),)
18   -ifdef CONFIG_SPL
19   -ifdef CONFIG_SPL_BUILD
20   -ALL-y += SPL
21   -endif
22   -else
23   -ALL-y += u-boot.imx
24   -endif
25   -endif
... ... @@ -180,9 +180,6 @@
180 180 MLO MLO.byteswap: $(obj)/u-boot-spl.bin
181 181 $(call if_changed,mkimage)
182 182  
183   -SPL: $(obj)/u-boot-spl.bin
184   - $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
185   -
186 183 ALL-y += $(obj)/$(SPL_BIN).bin
187 184  
188 185 ifdef CONFIG_SAMSUNG