diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-03-06 10:58:37 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-04-05 12:23:07 -0600 |
| commit | b40b25fff8205dd18124d8fc87b2c9c57f269b5f (patch) | |
| tree | 0539246db5bd1597fbbbc5630dfd4ac566e81fee /scripts | |
| parent | 85f02be8e5fd48a9bf8c719a4f12b4209b1e55b5 (diff) | |
| download | linux-stable-b40b25fff8205dd18124d8fc87b2c9c57f269b5f.tar.gz linux-stable-b40b25fff8205dd18124d8fc87b2c9c57f269b5f.tar.bz2 linux-stable-b40b25fff8205dd18124d8fc87b2c9c57f269b5f.zip | |
kbuild: always run gcc -E on *.dts, remove cmd_dtc_cpp
Replace cmd_dtc with cmd_dtc_cpp, and delete the latter.
Previously, a special file extension (.dtsp) was required to trigger
the C pre-processor to run on device tree files. This was ugly. Now that
previous changes have enhanced cmd_dtc_cpp to collect dependency
information from both gcc -E and dtc, we can transparently run the pre-
processor on all device tree files, irrespective of whether they
use /include/ or #include syntax to include *.dtsi.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 6104335234c6..3e73dfd838cd 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -269,21 +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) -d $(depfile).dtc $(dtc-tmp) ; \ - cat $(depfile).pre $(depfile).dtc > $(depfile) - -$(obj)/%.dtb: $(src)/%.dtsp FORCE - $(call if_changed_dep,dtc_cpp) - # Bzip2 # --------------------------------------------------------------------------- |