diff options
| author | Simon Glass <sjg@chromium.org> | 2021-03-25 06:40:52 +1300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-03-26 17:03:08 +1300 |
| commit | 56b313d1b637815dd01463698cc722a27ae361e4 (patch) | |
| tree | edcf20bfee60f2e55c12f6a8c172a1984058046c /scripts | |
| parent | 8490c578f4fa04e93cff220722b5ce3f7e756f62 (diff) | |
| download | u-boot-56b313d1b637815dd01463698cc722a27ae361e4.tar.gz u-boot-56b313d1b637815dd01463698cc722a27ae361e4.tar.xz u-boot-56b313d1b637815dd01463698cc722a27ae361e4.zip | |
Makefile: Use a variable for generated of-platdata headers
There are actually two generated files but only one is currently mentioned
in the Makefile as a dependency. Put them both in a Makefile variable and
use that instead, to avoid inconsistency.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.spl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 5f37a82931..11e9f6a17e 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -120,13 +120,14 @@ endif u-boot-spl-init := $(head-y) u-boot-spl-main := $(libs-y) ifdef CONFIG_$(SPL_TPL_)OF_PLATDATA +platdata-hdr := include/generated/dt-structs-gen.h include/generated/dt-decl.h ifdef CONFIG_$(SPL_TPL_)OF_PLATDATA_INST u-boot-spl-platdata := $(obj)/dts/dt-uclass.o $(obj)/dts/dt-device.o else u-boot-spl-platdata := $(obj)/dts/dt-plat.o endif u-boot-spl-platdata_c := $(patsubst %.o,%.c,$(u-boot-spl-platdata)) -endif +endif # OF_PLATDATA # Linker Script # First test whether there's a linker-script for the specific stage defined... @@ -327,15 +328,11 @@ cmd_dtoc = $(DTOC_ARGS) -c $(obj)/dts -C include/generated all quiet_cmd_plat = PLAT $@ cmd_plat = $(CC) $(c_flags) -c $< -o $(filter-out $(PHONY),$@) -targets += $(u-boot-spl-platdata) - -$(obj)/dts/dt-%.o: $(obj)/dts/dt-%.c \ - include/generated/dt-structs-gen.h prepare FORCE +$(obj)/dts/dt-%.o: $(obj)/dts/dt-%.c $(platdata-hdr) $(call if_changed,plat) # Don't use dts_dir here, since it forces running this expensive rule every time -include/generated/dt-structs-gen.h $(u-boot-spl-platdata_c) &: \ - $(obj)/$(SPL_BIN).dtb +$(platdata-hdr) $(u-boot-spl-platdata_c) &: $(obj)/$(SPL_BIN).dtb @[ -d $(obj)/dts ] || mkdir -p $(obj)/dts $(call if_changed,dtoc) |