meta-nuvoton: npcm8xx-igps patch refresh
https://gerrit.openbmc.org/c/openbmc/openbmc/+/55099 added npcm8xx-igps
together with a patch, and later npcm8xx-igps SRCREV was bumped in
https://gerrit.openbmc.org/c/openbmc/openbmc/+/57109, but the patch was
not refreshed. This would cause fuzz detected.
Change-Id: Iaeaf5aa8091b347039ed4cfa187e252e60660f00
Signed-off-by: Anthony <anthonyhkf@google.com>
diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps/0001-Adjust-paths-for-use-with-Bitbake.patch b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps/0001-Adjust-paths-for-use-with-Bitbake.patch
index 009df74..1a50151 100644
--- a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps/0001-Adjust-paths-for-use-with-Bitbake.patch
+++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps/0001-Adjust-paths-for-use-with-Bitbake.patch
@@ -1,9 +1,10 @@
-From b76adadc995bbb10e2b990dcda6bc4ff68fe2788 Mon Sep 17 00:00:00 2001
-From: Tim Lee <timlee660101@gmail.com>
-Date: Thu, 28 Jul 2022 14:57:30 +0800
+From 0df2a196a65d796211cf32db49adfd1f62e997e3 Mon Sep 17 00:00:00 2001
+From: Anthony <anthonyhkf@google.com>
+Date: Fri, 7 Oct 2022 15:24:00 +0800
Subject: [PATCH] Adjust paths for use with Bitbake
Signed-off-by: Tim Lee <timlee660101@gmail.com>
+Signed-off-by: Anthony <anthonyhkf@google.com>
---
py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml | 6 +++---
py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml | 6 +++---
@@ -16,7 +17,7 @@
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml b/py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml
-index 9f5be3d..dc6a33a 100755
+index 4ab84c9..d9d277e 100644
--- a/py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml
+++ b/py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml
@@ -52,7 +52,7 @@
@@ -41,10 +42,10 @@
</Bin_Ecc_Map>
diff --git a/py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml b/py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml
-index 5302604..043dc2c 100755
+index 683d647..6ac9535 100644
--- a/py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml
+++ b/py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
<offset>0x1FC</offset>
<size>0x4</size>
</config>
@@ -53,7 +54,7 @@
</BinField>
<BinField>
-@@ -60,9 +60,9 @@
+@@ -61,9 +61,9 @@
<name>Code</name>
<config>
<offset>0x200</offset>
@@ -66,10 +67,10 @@
</Bin_Ecc_Map>
diff --git a/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_EB.xml b/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_EB.xml
-index 0228373..ef5007a 100755
+index 6bddc9d..036980b 100644
--- a/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_EB.xml
+++ b/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_EB.xml
-@@ -545,7 +545,7 @@
+@@ -548,7 +548,7 @@
<offset>0x1FC</offset>
<size>0x4</size>
</config>
@@ -78,7 +79,7 @@
</BinField>
<BinField>
-@@ -553,9 +553,9 @@
+@@ -556,9 +556,9 @@
<name>Code</name>
<config>
<offset>0x200</offset>
@@ -91,10 +92,10 @@
</Bin_Ecc_Map>
diff --git a/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_SVB.xml b/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_SVB.xml
-index 1462cfb..772a167 100755
+index e22a1f8..02968f2 100644
--- a/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_SVB.xml
+++ b/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_SVB.xml
-@@ -547,7 +547,7 @@
+@@ -548,7 +548,7 @@
<offset>0x1FC</offset>
<size>0x4</size>
</config>
@@ -103,7 +104,7 @@
</BinField>
<BinField>
-@@ -555,9 +555,9 @@
+@@ -556,9 +556,9 @@
<name>Code</name>
<config>
<offset>0x200</offset>
@@ -116,9 +117,34 @@
</Bin_Ecc_Map>
diff --git a/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_EB.xml b/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_EB.xml
-index f75bf22..2a9f2be 100755
+index c751b76..621d456 100644
--- a/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_EB.xml
+++ b/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_EB.xml
+@@ -548,7 +548,7 @@
+ <offset>0x1FC</offset>
+ <size>0x4</size>
+ </config>
+- <content format='FileSize'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
++ <content format='FileSize'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
+ </BinField>
+
+ <BinField>
+@@ -556,9 +556,9 @@
+ <name>Code</name>
+ <config>
+ <offset>0x200</offset>
+- <size format='FileSize'>inputs/arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
++ <size format='FileSize'>arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
+ </config>
+- <content format='FileContent'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
++ <content format='FileContent'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
+ </BinField>
+
+ </Bin_Ecc_Map>
+diff --git a/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml b/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml
+index 0b77249..6086e66 100644
+--- a/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml
++++ b/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml
@@ -547,7 +547,7 @@
<offset>0x1FC</offset>
<size>0x4</size>
@@ -140,36 +166,11 @@
</BinField>
</Bin_Ecc_Map>
-diff --git a/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml b/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml
-index 5178ca9..1583c4d 100755
---- a/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml
-+++ b/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml
-@@ -546,7 +546,7 @@
- <offset>0x1FC</offset>
- <size>0x4</size>
- </config>
-- <content format='FileSize'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
-+ <content format='FileSize'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
- </BinField>
-
- <BinField>
-@@ -554,9 +554,9 @@
- <name>Code</name>
- <config>
- <offset>0x200</offset>
-- <size format='FileSize'>inputs/arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
-+ <size format='FileSize'>arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
- </config>
-- <content format='FileContent'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
-+ <content format='FileContent'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
- </BinField>
-
- </Bin_Ecc_Map>
diff --git a/py_scripts/ImageGeneration/references/UbootHeader_A1.xml b/py_scripts/ImageGeneration/references/UbootHeader_A1.xml
-index 54593db..bbfa015 100755
+index 685365a..96a5de9 100644
--- a/py_scripts/ImageGeneration/references/UbootHeader_A1.xml
+++ b/py_scripts/ImageGeneration/references/UbootHeader_A1.xml
-@@ -176,7 +176,7 @@
+@@ -53,7 +53,7 @@
<offset>0x1FC</offset> <!-- offset in the header -->
<size>0x4</size> <!-- size in the header -->
</config>
@@ -178,8 +179,8 @@
</BinField>
<BinField>
-@@ -184,9 +184,9 @@
- <name>Code</name> <!-- name of field -->
+@@ -61,9 +61,9 @@
+ <name>Code</name>
<config>
<offset>0x200</offset> <!-- offset in the header -->
- <size format='FileSize'>inputs/u-boot.bin</size> <!-- size in the header calculated by tool-->
@@ -191,10 +192,10 @@
diff --git a/py_scripts/ImageGeneration/references/UbootHeader_Z1.xml b/py_scripts/ImageGeneration/references/UbootHeader_Z1.xml
-index 54593db..bbfa015 100755
+index 685365a..96a5de9 100644
--- a/py_scripts/ImageGeneration/references/UbootHeader_Z1.xml
+++ b/py_scripts/ImageGeneration/references/UbootHeader_Z1.xml
-@@ -176,7 +176,7 @@
+@@ -53,7 +53,7 @@
<offset>0x1FC</offset> <!-- offset in the header -->
<size>0x4</size> <!-- size in the header -->
</config>
@@ -203,8 +204,8 @@
</BinField>
<BinField>
-@@ -184,9 +184,9 @@
- <name>Code</name> <!-- name of field -->
+@@ -61,9 +61,9 @@
+ <name>Code</name>
<config>
<offset>0x200</offset> <!-- offset in the header -->
- <size format='FileSize'>inputs/u-boot.bin</size> <!-- size in the header calculated by tool-->
@@ -216,5 +217,5 @@
--
-2.17.1
+2.38.0.rc1.362.ged0d419d3c-goog