From ccf495752b106f4343a971b32441c358f8256ad6 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 31 Jul 2013 23:41:39 -0700 Subject: UPSTREAM Revert Android "ARM: convert build of appended dtb zImage to list of dtbs" This reverts commit 5e9468632ea81e7d17fc9bd4457acbaffda7b370. Signed-off-by: Dan Willemsen --- scripts/Makefile.lib | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'scripts') 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 # --------------------------------------------------------------------------- -- cgit v1.2.3