Skip to content

Commit 894218c

Browse files
committed
Fix invalid DTS includes
Fixes the following build errors: > Error: arch/arm/dts/.rk3036-sdk.dtb.pre.tmp:77.1-10 syntax error > Error: arch/arm/dts/.rk3188-radxarock.dtb.pre.tmp:383.1-10 syntax error The generated DTS had `\#include` instead of `#include` Signed-off-by: Gleb Mazovetskiy <[email protected]>
1 parent 533d602 commit 894218c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

scripts/Makefile.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ quiet_cmd_dtc = DTC $@
308308
# Modified for U-Boot
309309
# Bring in any U-Boot-specific include at the end of the file
310310
cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
311-
(cat $<; $(if $(u_boot_dtsi),echo '\#include "$(u_boot_dtsi)"')) > $(pre-tmp); \
311+
(cat $<; $(if $(u_boot_dtsi),echo '#include "$(u_boot_dtsi)"')) > $(pre-tmp); \
312312
$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \
313313
$(DTC) -O dtb -o $@ -b 0 \
314314
-i $(dir $<) $(DTC_FLAGS) \

tools/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ HOSTCFLAGS_sha1.o := -pedantic
216216
HOSTCFLAGS_sha256.o := -pedantic
217217

218218
quiet_cmd_wrap = WRAP $@
219-
cmd_wrap = echo "\#include <../$(patsubst $(obj)/%,%,$@)>" >$@
219+
cmd_wrap = echo \#"include <../$(patsubst $(obj)/%,%,$@)>" >$@
220220

221221
$(obj)/lib/%.c $(obj)/common/%.c $(obj)/env/%.c:
222222
$(call cmd,wrap)

0 commit comments

Comments
 (0)