diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-06-18 12:37:47 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-06-18 12:58:51 +0200 |
| commit | 10eafd629720672ce099898b460aae3d3a3d9e5d (patch) | |
| tree | 21765fed0a1f964f63ad878f8f48371e5608f8ec /rules/dtc.make | |
| parent | a364b545b028a5ca49179a616f1fb838840d0297 (diff) | |
| download | ptxdist-10eafd629720672ce099898b460aae3d3a3d9e5d.tar.gz ptxdist-10eafd629720672ce099898b460aae3d3a3d9e5d.tar.xz | |
dtc: move dtb creation to shell
The latest changes broke the dependencies and variable resolution again.
Fixing this in shell was a lot easier and cleaner.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/dtc.make')
| -rw-r--r-- | rules/dtc.make | 52 |
1 files changed, 11 insertions, 41 deletions
diff --git a/rules/dtc.make b/rules/dtc.make index 4176a579c..6aa321f16 100644 --- a/rules/dtc.make +++ b/rules/dtc.make @@ -25,52 +25,22 @@ ptx/dtb = $(notdir $(basename $(strip $(1)))).dtb ptx/dts = $(shell p=$(PTXCONF_DTC_OFTREE_DTS_PATH) ptxd_in_path p "$(strip $(1))" && echo "$${ptxd_reply}") ifdef PTXCONF_DTC_OFTREE_DTS +# Note: this must match the magic in ptxd_make_dts_dtb DTC_OFTREE_DTS = $(foreach dts, $(call remove_quotes,$(PTXCONF_DTC_OFTREE_DTS)), \ $(if $(filter /%,$(dts)),$(dts),$(call ptx/dts,$(dts)))) endif -%.dtb: TMP_DTS = $(STATEDIR)/$(notdir $<).tmp -%.dtb: TMP_DEPS = $(PTXDIST_TEMPDIR)/dts.deps -%.dtb: DEPS = $(STATEDIR)/dtc.$(notdir $<).deps -%.dtb: +dts/env = \ + $(call ptx/env) \ + dts_path=$(PTXCONF_DTC_OFTREE_DTS_PATH) \ + dts_dtb="$(strip $(1))" \ + dts_dts="$(strip $(2))" \ + dts_kernel_dir="$(KERNEL_DIR)" \ + dts_kernel_arch="$(GENERIC_KERNEL_ARCH)" + +%.dtb: $(STATEDIR)/dtc.install @$(call targetinfo) - @if [ -z "$(strip $<)" ]; then \ - ptxd_bailout "Device-tree for `ptxd_print_path '$@'` undefined!"; \ - fi - @if [ ! -e "$(strip $<)" ]; then \ - ptxd_bailout "Device-tree '$<' not found!"; \ - fi - @echo CPP `ptxd_print_path "$(TMP_DTS)"` - @cpp \ - -Wp,-MD,$(TMP_DEPS) \ - -Wp,-MT,$(TMP_DTS) \ - -nostdinc \ - -P \ - -I$(dir $<) \ - -I$(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts \ - -I$(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts/include \ - -I$(KERNEL_DIR)/include \ - -undef -D__DTS__ -x assembler-with-cpp \ - -o $(TMP_DTS) \ - $< - @sed -e 's;^$(TMP_DTS):;$@:;' -e 's;^ \([^ ]*\); $$(wildcard \1);' $(TMP_DEPS) > $(DEPS) - @echo DTC `ptxd_print_path "$@"` - @if $(PTXCONF_SYSROOT_HOST)/bin/dtc -h 2>&1 | grep -q "^[[:space:]]\+-i\(,.*\)\?$$"; then \ - dtc_include="-i $(dir $<) -i $(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts"; \ - fi; \ - $(PTXCONF_SYSROOT_HOST)/bin/dtc \ - $(call remove_quotes,$(PTXCONF_DTC_EXTRA_ARGS)) \ - $$dtc_include \ - -d $(TMP_DEPS) \ - -I dts -O dtb -b 0 \ - -o "$@" "$(TMP_DTS)" - @awk '{ \ - printf "%s", $$1 ; \ - for (i = 2; i <= NF; i++) { \ - printf " $$(wildcard %s)", $$i; \ - }; \ - print "" \ - }' $(TMP_DEPS) >> $(DEPS) + @$(call dts/env, $@, $(DTB_DTS)) ptxd_make_dts_dtb @$(call finish) DTC_DTB = $(foreach dts, $(call remove_quotes,$(PTXCONF_DTC_OFTREE_DTS)), $(IMAGEDIR)/$(call ptx/dtb, $(dts))) |