diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-04-09 14:59:04 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-04-09 14:59:04 -0500 |
| commit | a2f682aeeecfa791de19de63509566d156d0d1a3 (patch) | |
| tree | e291ca2915e4fc61e3a47ccf2fceedd084f6fba3 /scripts/Makefile.lib | |
| parent | d450f445f9a654080a6be4094376c2192d9a1f36 (diff) | |
| parent | 4be505d4fc7a07371a2b658469ca1dda99993ca3 (diff) | |
Merge tag 'tegra-for-3.10-dtc-cpp-chroot-std-headers' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into for-next
Pull DT C pre-processor changes from Stephen Warren:
dt: run C pre-processor on *.dts, create some standard headers
This branch enhances the support for running dtc on device tree files.
A dedicated directory is created for header files that provide constants
for device-tree bindings.
The kbuild dependency script processor is enhanced to support processing
the dependency outputs from multiple separate commands at once.
The kbuild dtc rule is modified so that the C pre-processor is always
applied when compiling any device tree.
Some standard headers are created which define common constants for GPIO,
IRQ, and ARM GIC device tree bindings.
Diffstat (limited to 'scripts/Makefile.lib')
| -rw-r--r-- | scripts/Makefile.lib | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 07125e697d7..3e73dfd838c 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -156,9 +156,9 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ ld_flags = $(LDFLAGS) $(ldflags-y) -dtc_cpp_flags = -Wp,-MD,$(depfile) -nostdinc \ +dtc_cpp_flags = -Wp,-MD,$(depfile).pre -nostdinc \ -I$(srctree)/arch/$(SRCARCH)/boot/dts \ - -I$(srctree)/arch/$(SRCARCH)/include/dts \ + -I$(srctree)/arch/$(SRCARCH)/boot/dts/include \ -undef -D__DTS__ # Finds the multi-part object the current object will be linked into @@ -269,20 +269,17 @@ $(obj)/%.dtb.S: $(obj)/%.dtb $(call cmd,dt_S_dtb) quiet_cmd_dtc = DTC $@ -cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $< +cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ + $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \ + -i $(srctree)/arch/$(SRCARCH)/boot/dts $(DTC_FLAGS) \ + -d $(depfile).dtc $(dtc-tmp) ; \ + cat $(depfile).pre $(depfile).dtc > $(depfile) $(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 # --------------------------------------------------------------------------- |