blob: 009df74bcc09f1fbe682f60725e1fa99bd95991f [file] [log] [blame]
Tim Lee1c9c10a2022-07-05 17:14:18 +08001From b76adadc995bbb10e2b990dcda6bc4ff68fe2788 Mon Sep 17 00:00:00 2001
2From: Tim Lee <timlee660101@gmail.com>
3Date: Thu, 28 Jul 2022 14:57:30 +0800
4Subject: [PATCH] Adjust paths for use with Bitbake
5
6Signed-off-by: Tim Lee <timlee660101@gmail.com>
7---
8 py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml | 6 +++---
9 py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml | 6 +++---
10 .../ImageGeneration/references/BootBlockAndHeader_A1_EB.xml | 6 +++---
11 .../references/BootBlockAndHeader_A1_SVB.xml | 6 +++---
12 .../ImageGeneration/references/BootBlockAndHeader_Z1_EB.xml | 6 +++---
13 .../references/BootBlockAndHeader_Z1_SVB.xml | 6 +++---
14 py_scripts/ImageGeneration/references/UbootHeader_A1.xml | 6 +++---
15 py_scripts/ImageGeneration/references/UbootHeader_Z1.xml | 6 +++---
16 8 files changed, 24 insertions(+), 24 deletions(-)
17
18diff --git a/py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml b/py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml
19index 9f5be3d..dc6a33a 100755
20--- a/py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml
21+++ b/py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml
22@@ -52,7 +52,7 @@
23 <offset>0x1FC</offset>
24 <size>0x4</size>
25 </config>
26- <content format='FileSize'>inputs/bl31.bin</content> <!-- content the user should fill -->
27+ <content format='FileSize'>bl31.bin</content> <!-- content the user should fill -->
28 </BinField>
29
30 <BinField>
31@@ -60,9 +60,9 @@
32 <name>Code</name>
33 <config>
34 <offset>0x200</offset>
35- <size format='FileSize'>inputs/bl31.bin</size> <!-- size in the header calculated by tool-->
36+ <size format='FileSize'>bl31.bin</size> <!-- size in the header calculated by tool-->
37 </config>
38- <content format='FileContent'>inputs/bl31.bin</content> <!-- content the user should fill -->
39+ <content format='FileContent'>bl31.bin</content> <!-- content the user should fill -->
40 </BinField>
41
42 </Bin_Ecc_Map>
43diff --git a/py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml b/py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml
44index 5302604..043dc2c 100755
45--- a/py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml
46+++ b/py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml
47@@ -52,7 +52,7 @@
48 <offset>0x1FC</offset>
49 <size>0x4</size>
50 </config>
51- <content format='FileSize'>inputs/tee.bin</content> <!-- content the user should fill -->
52+ <content format='FileSize'>tee.bin</content> <!-- content the user should fill -->
53 </BinField>
54
55 <BinField>
56@@ -60,9 +60,9 @@
57 <name>Code</name>
58 <config>
59 <offset>0x200</offset>
60- <size format='FileSize'>inputs/tee.bin</size> <!-- size in the header calculated by tool-->
61+ <size format='FileSize'>tee.bin</size> <!-- size in the header calculated by tool-->
62 </config>
63- <content format='FileContent'>inputs/tee.bin</content> <!-- content the user should fill -->
64+ <content format='FileContent'>tee.bin</content> <!-- content the user should fill -->
65 </BinField>
66
67 </Bin_Ecc_Map>
68diff --git a/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_EB.xml b/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_EB.xml
69index 0228373..ef5007a 100755
70--- a/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_EB.xml
71+++ b/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_EB.xml
72@@ -545,7 +545,7 @@
73 <offset>0x1FC</offset>
74 <size>0x4</size>
75 </config>
76- <content format='FileSize'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
77+ <content format='FileSize'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
78 </BinField>
79
80 <BinField>
81@@ -553,9 +553,9 @@
82 <name>Code</name>
83 <config>
84 <offset>0x200</offset>
85- <size format='FileSize'>inputs/arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
86+ <size format='FileSize'>arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
87 </config>
88- <content format='FileContent'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
89+ <content format='FileContent'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
90 </BinField>
91
92 </Bin_Ecc_Map>
93diff --git a/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_SVB.xml b/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_SVB.xml
94index 1462cfb..772a167 100755
95--- a/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_SVB.xml
96+++ b/py_scripts/ImageGeneration/references/BootBlockAndHeader_A1_SVB.xml
97@@ -547,7 +547,7 @@
98 <offset>0x1FC</offset>
99 <size>0x4</size>
100 </config>
101- <content format='FileSize'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
102+ <content format='FileSize'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
103 </BinField>
104
105 <BinField>
106@@ -555,9 +555,9 @@
107 <name>Code</name>
108 <config>
109 <offset>0x200</offset>
110- <size format='FileSize'>inputs/arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
111+ <size format='FileSize'>arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
112 </config>
113- <content format='FileContent'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
114+ <content format='FileContent'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
115 </BinField>
116
117 </Bin_Ecc_Map>
118diff --git a/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_EB.xml b/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_EB.xml
119index f75bf22..2a9f2be 100755
120--- a/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_EB.xml
121+++ b/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_EB.xml
122@@ -547,7 +547,7 @@
123 <offset>0x1FC</offset>
124 <size>0x4</size>
125 </config>
126- <content format='FileSize'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
127+ <content format='FileSize'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
128 </BinField>
129
130 <BinField>
131@@ -555,9 +555,9 @@
132 <name>Code</name>
133 <config>
134 <offset>0x200</offset>
135- <size format='FileSize'>inputs/arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
136+ <size format='FileSize'>arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
137 </config>
138- <content format='FileContent'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
139+ <content format='FileContent'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
140 </BinField>
141
142 </Bin_Ecc_Map>
143diff --git a/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml b/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml
144index 5178ca9..1583c4d 100755
145--- a/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml
146+++ b/py_scripts/ImageGeneration/references/BootBlockAndHeader_Z1_SVB.xml
147@@ -546,7 +546,7 @@
148 <offset>0x1FC</offset>
149 <size>0x4</size>
150 </config>
151- <content format='FileSize'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
152+ <content format='FileSize'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
153 </BinField>
154
155 <BinField>
156@@ -554,9 +554,9 @@
157 <name>Code</name>
158 <config>
159 <offset>0x200</offset>
160- <size format='FileSize'>inputs/arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
161+ <size format='FileSize'>arbel_a35_bootblock.bin</size> <!-- size in the header calculated by tool-->
162 </config>
163- <content format='FileContent'>inputs/arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
164+ <content format='FileContent'>arbel_a35_bootblock.bin</content> <!-- content the user should fill -->
165 </BinField>
166
167 </Bin_Ecc_Map>
168diff --git a/py_scripts/ImageGeneration/references/UbootHeader_A1.xml b/py_scripts/ImageGeneration/references/UbootHeader_A1.xml
169index 54593db..bbfa015 100755
170--- a/py_scripts/ImageGeneration/references/UbootHeader_A1.xml
171+++ b/py_scripts/ImageGeneration/references/UbootHeader_A1.xml
172@@ -176,7 +176,7 @@
173 <offset>0x1FC</offset> <!-- offset in the header -->
174 <size>0x4</size> <!-- size in the header -->
175 </config>
176- <content format='FileSize'>inputs/u-boot.bin</content> <!-- content the user should fill -->
177+ <content format='FileSize'>u-boot.bin</content> <!-- content the user should fill -->
178 </BinField>
179
180 <BinField>
181@@ -184,9 +184,9 @@
182 <name>Code</name> <!-- name of field -->
183 <config>
184 <offset>0x200</offset> <!-- offset in the header -->
185- <size format='FileSize'>inputs/u-boot.bin</size> <!-- size in the header calculated by tool-->
186+ <size format='FileSize'>u-boot.bin</size> <!-- size in the header calculated by tool-->
187 </config>
188- <content format='FileContent'>inputs/u-boot.bin</content> <!-- content the user should fill -->
189+ <content format='FileContent'>u-boot.bin</content> <!-- content the user should fill -->
190 </BinField>
191
192
193diff --git a/py_scripts/ImageGeneration/references/UbootHeader_Z1.xml b/py_scripts/ImageGeneration/references/UbootHeader_Z1.xml
194index 54593db..bbfa015 100755
195--- a/py_scripts/ImageGeneration/references/UbootHeader_Z1.xml
196+++ b/py_scripts/ImageGeneration/references/UbootHeader_Z1.xml
197@@ -176,7 +176,7 @@
198 <offset>0x1FC</offset> <!-- offset in the header -->
199 <size>0x4</size> <!-- size in the header -->
200 </config>
201- <content format='FileSize'>inputs/u-boot.bin</content> <!-- content the user should fill -->
202+ <content format='FileSize'>u-boot.bin</content> <!-- content the user should fill -->
203 </BinField>
204
205 <BinField>
206@@ -184,9 +184,9 @@
207 <name>Code</name> <!-- name of field -->
208 <config>
209 <offset>0x200</offset> <!-- offset in the header -->
210- <size format='FileSize'>inputs/u-boot.bin</size> <!-- size in the header calculated by tool-->
211+ <size format='FileSize'>u-boot.bin</size> <!-- size in the header calculated by tool-->
212 </config>
213- <content format='FileContent'>inputs/u-boot.bin</content> <!-- content the user should fill -->
214+ <content format='FileContent'>u-boot.bin</content> <!-- content the user should fill -->
215 </BinField>
216
217
218--
2192.17.1
220