diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-07-31 23:41:39 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:18:05 -0700 |
| commit | ccf495752b106f4343a971b32441c358f8256ad6 (patch) | |
| tree | 6eaab42abd5aa971819abbb16e277189a75f1ec6 /scripts | |
| parent | 65832a6d9f2603a1e6a1d12a313b7b7f823ac9f6 (diff) | |
UPSTREAM Revert Android "ARM: convert build of appended dtb zImage to list of dtbs"
This reverts commit 5e9468632ea81e7d17fc9bd4457acbaffda7b370.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
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 # --------------------------------------------------------------------------- |