diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-05-08 13:50:33 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-10-17 19:43:12 -0700 |
| commit | 7904f1f74f7958fd0e640eabf0a7f56a5139c6d1 (patch) | |
| tree | 44e05ea13be4c0539944a5c5ae73a126e49f657e /scripts | |
| parent | 1f518e8958dfb9dd6248a920f7219e066a0a84b4 (diff) | |
Revert "ARM: convert build of appended dtb zImage to list of dtbs"
This reverts commit 5e9468632ea81e7d17fc9bd4457acbaffda7b370.
Tixy was seeing trouble with "make dtbs" and "make my-boards.dtb",
and found reverting this resolves the issue. So for now lets
revert this.
Reported-by: Jon Medhurst (Tixy) <tixy@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index ef2142a61593..bd161eff6921 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -273,11 +273,17 @@ $(obj)/%.dtb: $(src)/%.dts FORCE dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) -# cat -# --------------------------------------------------------------------------- -# Concatentate multiple files together -quiet_cmd_cat = CAT $@ -cmd_cat = (cat $(filter-out FORCE,$^) > $@) || (rm -f $@; false) +$(obj)/%.dtb: $(src)/%.dts FORCE + $(call if_changed_dep,dtc) + +dtc-tmp = $(subst $(comma),_,$(dot-target).dts) + +quiet_cmd_dtc_cpp = DTC+CPP $@ +cmd_dtc_cpp = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ + $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $(dtc-tmp) + +$(obj)/%.dtb: $(src)/%.dtsp FORCE + $(call if_changed_dep,dtc_cpp) # Bzip2 # --------------------------------------------------------------------------- |