|
@@ -311,7 +311,7 @@ quiet_cmd_dtc = DTC $@
|
|
# Bring in any U-Boot-specific include after the '/dts-v1/;' header
|
|
# Bring in any U-Boot-specific include after the '/dts-v1/;' header
|
|
cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
|
|
cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
|
|
cat $< $(if $(u_boot_dtsi),\
|
|
cat $< $(if $(u_boot_dtsi),\
|
|
- | sed 's%^/ {$$%\#include \"$(u_boot_dtsi)\"\n&%') | \
|
|
|
|
|
|
+ | sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \
|
|
$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
|
|
$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
|
|
$(DTC) -O dtb -o $@ -b 0 \
|
|
$(DTC) -O dtb -o $@ -b 0 \
|
|
-i $(dir $<) $(DTC_FLAGS) \
|
|
-i $(dir $<) $(DTC_FLAGS) \
|