From 1f76bce8544acd38f7bb1e822540f8ca521e1b7f Mon Sep 17 00:00:00 2001 From: John Stultz Date: Wed, 8 May 2013 13:50:33 -0700 Subject: 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) Signed-off-by: John Stultz --- scripts/Makefile.lib | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'scripts/Makefile.lib') diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 2860f31da38..07125e697d7 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -271,11 +271,17 @@ $(obj)/%.dtb.S: $(obj)/%.dtb quiet_cmd_dtc = DTC $@ cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $< -# 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