diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-10-17 19:43:30 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-10-17 19:43:30 -0700 |
| commit | 67a2ddd473d91d42686446371faf33683f212844 (patch) | |
| tree | ddc1c5eeed5625439fc0741b627f41e97377e989 /scripts | |
| parent | 19efb81ae70ac3904de458078419616647b0cf31 (diff) | |
| parent | 84bb63eb93e4448e891108195ba0a8f654329779 (diff) | |
Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.12-merge
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 08a22e0ceaf7..d3f432588187 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 # --------------------------------------------------------------------------- |