Commit b40b25ff authored by Stephen Warren's avatar Stephen Warren
Browse files

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: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
parent 85f02be8

scripts/Makefile.lib

+5 −9
Original line number Original line Diff line number Diff line
@@ -269,21 +269,17 @@ $(obj)/%.dtb.S: $(obj)/%.dtb 
	$(call cmd,dt_S_dtb)

	$(call cmd,dt_S_dtb)





quiet_cmd_dtc = DTC     $@

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

$(obj)/%.dtb: $(src)/%.dts FORCE

	$(call if_changed_dep,dtc)

	$(call if_changed_dep,dtc)





dtc-tmp = $(subst $(comma),_,$(dot-target).dts)

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

# Bzip2

# ---------------------------------------------------------------------------

# ---------------------------------------------------------------------------

CRA Git | Maintained and supported by SUSTech CRA and CCSE