From e7eab12a23872bc90f66b6dd5c4d15b690ad6c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=9F=E9=BA=9F?= <648132795@qq.com>
Date: Mon, 29 May 2023 07:15:54 +0000
Subject: [PATCH 1/3] =?UTF-8?q?fixed=20the=20problem=20of=20wrong=20refere?=
 =?UTF-8?q?nce=20to=20uboot=E2=80=99s=20dtsi=20fixed=20the=20problem=20of?=
 =?UTF-8?q?=20wrong=20reference=20to=20uboot=E2=80=99s=20dtsi=20in=20the?=
 =?UTF-8?q?=20Makefile.lib=20file=20under=20the=20scripts=20directory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 江麟 <648132795@qq.com>
---
 scripts/Makefile.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 8f19b2db56..4a6a154bd3 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -318,7 +318,7 @@ quiet_cmd_dtc = DTC     $@
 # Modified for U-Boot
 # Bring in any U-Boot-specific include at the end of the file
 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) \
-- 
Gitee


From 7f6df6fa8b5a5a4e1c9e814fc5cef5d1bd196069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=9F=E9=BA=9F?= <648132795@qq.com>
Date: Mon, 29 May 2023 07:16:43 +0000
Subject: [PATCH 2/3] =?UTF-8?q?fixed=20the=20problem=20of=20wrong=20refere?=
 =?UTF-8?q?nce=20fixed=20the=20problem=20of=20wrong=20reference=20to=20ubo?=
 =?UTF-8?q?ot=E2=80=99s=20dtsi=20in=20the=20Makefile.lib=20file=20under=20?=
 =?UTF-8?q?the=20scripts=20directory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 江麟 <648132795@qq.com>
---
 scripts/Makefile.lib | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 4a6a154bd3..9c9d099948 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -317,6 +317,7 @@ $(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); \
 	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \
-- 
Gitee


From ce9e8e8e0052c8637b1050458b282ae2bf42c517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=9F=E9=BA=9F?= <648132795@qq.com>
Date: Mon, 29 May 2023 07:18:18 +0000
Subject: [PATCH 3/3] Fixed the problem of repeated definition of the yylloc
 variable Fixed the problem of repeated definition of the yylloc variable in
 the dtc-parser.tab.c_shipped file under the scripts/dtc directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 江麟 <648132795@qq.com>
---
 scripts/dtc/dtc-parser.tab.c_shipped | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/dtc/dtc-parser.tab.c_shipped b/scripts/dtc/dtc-parser.tab.c_shipped
index aea514fa69..3c91743c54 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;
 
-- 
Gitee