Eric Lee / smarc-uboot

92
Download as
Browse Code »

Commit 395e60cdc292dc0183c6867d34b43f14a373df55

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 519fdde9e6
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

kbuild: fix a bug in regeneration of linker scripts 

In some use cases, SPL linker script was not updated even when
it should be.

For instance,

  $ make tricoder_config all
    [ build complete ]
  ... modify include/configs/tricoder.h
  $ make

spl/u-boot-spl.lds should be updated in this case, but it wasn't.

To fix this problem, linker scripts generation should be handled
by $(call if_changed_dep,...) rather than by $(call if_changed,...).

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reported-by: Andreas Bießmann <andreas.devel@googlemail.com>
Tested-by: Andreas Bießmann <andreas.devel@googlemail.com>

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

... ... @@ -1053,11 +1053,11 @@
1053 1053  
1054 1054 # ---------------------------------------------------------------------------
1055 1055 quiet_cmd_cpp_lds = LDS $@
1056   -cmd_cpp_lds = $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ \
1057   - -x assembler-with-cpp -P -o $@ $<
  1056 +cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
  1057 + -D__ASSEMBLY__ -x assembler-with-cpp -P -o $@ $<
1058 1058  
1059 1059 u-boot.lds: $(LDSCRIPT) prepare FORCE
1060   - $(call if_changed,cpp_lds)
  1060 + $(call if_changed_dep,cpp_lds)
1061 1061  
1062 1062 PHONY += nand_spl
1063 1063 nand_spl: prepare
... ... @@ -231,11 +231,11 @@
231 231 $(Q)$(MAKE) $(build)=$@
232 232  
233 233 quiet_cmd_cpp_lds = LDS $@
234   -cmd_cpp_lds = $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ \
235   - -x assembler-with-cpp -P -o $@ $<
  234 +cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
  235 + -D__ASSEMBLY__ -x assembler-with-cpp -P -o $@ $<
236 236  
237 237 $(obj)/u-boot-spl.lds: $(LDSCRIPT) FORCE
238   - $(call if_changed,cpp_lds)
  238 + $(call if_changed_dep,cpp_lds)
239 239  
240 240 # read all saved command lines
241 241