diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 8f19b2db56d973d012b4cd7709bd93cd4616de66..9c9d0999489252ccb289d1dd63462e5286419e91 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -317,8 +317,9 @@ $(obj)/%.dtb.S: $(obj)/%.dtb quiet_cmd_dtc = DTC $@ # Modified for U-Boot # Bring in any U-Boot-specific include at the end of the file +# Jiang Lin deleted the slash in front of #include on May 29, 2023, reason: cannot be parsed correctly cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ - (cat $<; $(if $(u_boot_dtsi),echo '\#include "$(u_boot_dtsi)"')) > $(pre-tmp); \ + (cat $<; $(if $(u_boot_dtsi),echo '#include "$(u_boot_dtsi)"')) > $(pre-tmp); \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ diff --git a/scripts/dtc/dtc-parser.tab.c_shipped b/scripts/dtc/dtc-parser.tab.c_shipped index aea514fa69286401700e2d6786af0bd587acd8b4..3c91743c54faf54de97046282f38ab0494b901cd 100644 --- a/scripts/dtc/dtc-parser.tab.c_shipped +++ b/scripts/dtc/dtc-parser.tab.c_shipped @@ -1202,11 +1202,12 @@ int yychar; /* The semantic value of the lookahead symbol. */ YYSTYPE yylval; /* Location data for the lookahead symbol. */ -YYLTYPE yylloc -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL - = { 1, 1, 1, 1 } -# endif -; +/* Annotated by Jiang Lin on May 29, 2023, reason: Multiple variables are defined repeatedly */ +// YYLTYPE yylloc +// # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +// = { 1, 1, 1, 1 } +// # endif +// ; /* Number of syntax errors so far. */ int yynerrs;