Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 838404054e406e82938cbf7be7f90cce058d453b

Authored by Andre Przywara
Committed by Simon Glass
1 parent 30d704c645
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

doc: FIT image: fix incorrect description of DT node unit address 

The DT spec demands a unit-address in a node name to match the "reg"
property in that node. Newer dtc versions will throw warnings if this is
not the case.
Fix all occurences in the FIT image documentation files where this was not
observed, to not give bad examples to the reader.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>

Showing 7 changed files with 196 additions and 196 deletions Side-by-side Diff

doc/uImage.FIT/beaglebone_vboot.txt
Diff comments   View file @ 8384040
... ... @@ -130,7 +130,7 @@
130 130 #address-cells = <1>;
131 131  
132 132 images {
133   - kernel@1 {
  133 + kernel {
134 134 data = /incbin/("Image.lzo");
135 135 type = "kernel";
136 136 arch = "arm";
137 137  
138 138  
139 139  
... ... @@ -138,27 +138,27 @@
138 138 compression = "lzo";
139 139 load = <0x80008000>;
140 140 entry = <0x80008000>;
141   - hash@1 {
  141 + hash-1 {
142 142 algo = "sha1";
143 143 };
144 144 };
145   - fdt@1 {
  145 + fdt-1 {
146 146 description = "beaglebone-black";
147 147 data = /incbin/("am335x-boneblack.dtb");
148 148 type = "flat_dt";
149 149 arch = "arm";
150 150 compression = "none";
151   - hash@1 {
  151 + hash-1 {
152 152 algo = "sha1";
153 153 };
154 154 };
155 155 };
156 156 configurations {
157   - default = "conf@1";
158   - conf@1 {
159   - kernel = "kernel@1";
160   - fdt = "fdt@1";
161   - signature@1 {
  157 + default = "conf-1";
  158 + conf-1 {
  159 + kernel = "kernel";
  160 + fdt = "fdt-1";
  161 + signature-1 {
162 162 algo = "sha1,rsa2048";
163 163 key-name-hint = "dev";
164 164 sign-images = "fdt", "kernel";
... ... @@ -211,7 +211,7 @@
211 211  
212 212 FIT description: Beaglebone black
213 213 Created: Sun Jun 1 12:50:30 2014
214   - Image 0 (kernel@1)
  214 + Image 0 (kernel)
215 215 Description: unavailable
216 216 Created: Sun Jun 1 12:50:30 2014
217 217 Type: Kernel Image
... ... @@ -223,7 +223,7 @@
223 223 Entry Point: 0x80008000
224 224 Hash algo: sha1
225 225 Hash value: c94364646427e10f423837e559898ef02c97b988
226   - Image 1 (fdt@1)
  226 + Image 1 (fdt-1)
227 227 Description: beaglebone-black
228 228 Created: Sun Jun 1 12:50:30 2014
229 229 Type: Flat Device Tree
230 230  
... ... @@ -232,11 +232,11 @@
232 232 Architecture: ARM
233 233 Hash algo: sha1
234 234 Hash value: cb09202f889d824f23b8e4404b781be5ad38a68d
235   - Default Configuration: 'conf@1'
236   - Configuration 0 (conf@1)
  235 + Default Configuration: 'conf-1'
  236 + Configuration 0 (conf-1)
237 237 Description: unavailable
238   - Kernel: kernel@1
239   - FDT: fdt@1
  238 + Kernel: kernel
  239 + FDT: fdt-1
240 240  
241 241  
242 242 Now am335x-boneblack-pubkey.dtb contains the public key and image.fit contains
243 243  
... ... @@ -251,12 +251,12 @@
251 251  
252 252 Verifying Hash Integrity ... sha1,rsa2048:dev+
253 253 ## Loading kernel from FIT Image at 7fc6ee469000 ...
254   - Using 'conf@1' configuration
  254 + Using 'conf-1' configuration
255 255 Verifying Hash Integrity ...
256 256 sha1,rsa2048:dev+
257 257 OK
258 258  
259   - Trying 'kernel@1' kernel subimage
  259 + Trying 'kernel' kernel subimage
260 260 Description: unavailable
261 261 Created: Sun Jun 1 12:50:30 2014
262 262 Type: Kernel Image
... ... @@ -274,8 +274,8 @@
274 274  
275 275 Unimplemented compression type 4
276 276 ## Loading fdt from FIT Image at 7fc6ee469000 ...
277   - Using 'conf@1' configuration
278   - Trying 'fdt@1' fdt subimage
  277 + Using 'conf-1' configuration
  278 + Trying 'fdt-1' fdt subimage
279 279 Description: beaglebone-black
280 280 Created: Sun Jun 1 12:50:30 2014
281 281 Type: Flat Device Tree
... ... @@ -291,7 +291,7 @@
291 291 Loading Flat Device Tree ... OK
292 292  
293 293 ## Loading ramdisk from FIT Image at 7fc6ee469000 ...
294   - Using 'conf@1' configuration
  294 + Using 'conf-1' configuration
295 295 Could not find subimage node
296 296  
297 297 Signature check OK
... ... @@ -313,8 +313,8 @@
313 313 But it is fun to do this by hand, so you can load image.fit into a hex editor
314 314 like ghex, and change a byte in the kernel:
315 315  
316   - $UOUT/tools/fit_info -f image.fit -n /images/kernel@1 -p data
317   -NAME: kernel@1
  316 + $UOUT/tools/fit_info -f image.fit -n /images/kernel -p data
  317 +NAME: kernel
318 318 LEN: 7790938
319 319 OFF: 168
320 320  
321 321  
... ... @@ -324,12 +324,12 @@
324 324  
325 325 Verifying Hash Integrity ... sha1,rsa2048:dev+
326 326 ## Loading kernel from FIT Image at 7f5a39571000 ...
327   - Using 'conf@1' configuration
  327 + Using 'conf-1' configuration
328 328 Verifying Hash Integrity ...
329 329 sha1,rsa2048:dev+
330 330 OK
331 331  
332   - Trying 'kernel@1' kernel subimage
  332 + Trying 'kernel' kernel subimage
333 333 Description: unavailable
334 334 Created: Sun Jun 1 13:09:21 2014
335 335 Type: Kernel Image
336 336  
... ... @@ -343,12 +343,12 @@
343 343 Hash value: c94364646427e10f423837e559898ef02c97b988
344 344 Verifying Hash Integrity ...
345 345 sha1 error
346   -Bad hash value for 'hash@1' hash node in 'kernel@1' image node
  346 +Bad hash value for 'hash-1' hash node in 'kernel' image node
347 347 Bad Data Hash
348 348  
349 349 ## Loading fdt from FIT Image at 7f5a39571000 ...
350   - Using 'conf@1' configuration
351   - Trying 'fdt@1' fdt subimage
  350 + Using 'conf-1' configuration
  351 + Trying 'fdt-1' fdt subimage
352 352 Description: beaglebone-black
353 353 Created: Sun Jun 1 13:09:21 2014
354 354 Type: Flat Device Tree
... ... @@ -364,7 +364,7 @@
364 364 Loading Flat Device Tree ... OK
365 365  
366 366 ## Loading ramdisk from FIT Image at 7f5a39571000 ...
367   - Using 'conf@1' configuration
  367 + Using 'conf-1' configuration
368 368 Could not find subimage node
369 369  
370 370 Signature check Bad (error 1)
371 371  
... ... @@ -386,11 +386,11 @@
386 386 configurations
387 387  
388 388 fdtget -l image.fit /configurations
389   -conf@1
390   -fdtget -l image.fit /configurations/conf@1
391   -signature@1
  389 +conf-1
  390 +fdtget -l image.fit /configurations/conf-1
  391 +signature-1
392 392  
393   - fdtget -p image.fit /configurations/conf@1/signature@1
  393 + fdtget -p image.fit /configurations/conf-1/signature-1
394 394 hashed-strings
395 395 hashed-nodes
396 396 timestamp
397 397  
398 398  
399 399  
... ... @@ -401,20 +401,20 @@
401 401 key-name-hint
402 402 sign-images
403 403  
404   - fdtget image.fit /configurations/conf@1/signature@1 hashed-nodes
405   -/ /configurations/conf@1 /images/fdt@1 /images/fdt@1/hash@1 /images/kernel@1 /images/kernel@1/hash@1
  404 + fdtget image.fit /configurations/conf-1/signature-1 hashed-nodes
  405 +/ /configurations/conf-1 /images/fdt-1 /images/fdt-1/hash /images/kernel /images/kernel/hash-1
406 406  
407 407 This gives us a bit of a look into the signature that mkimage added. Note you
408 408 can also use fdtdump to list the entire device tree.
409 409  
410 410 Say we want to change the kernel that this configuration uses
411   -(/images/kernel@1). We could just put a new kernel in the image, but we will
  411 +(/images/kernel). We could just put a new kernel in the image, but we will
412 412 need to change the hash to match. Let's simulate that by changing a byte of
413 413 the hash:
414 414  
415   - fdtget -tx image.fit /images/kernel@1/hash@1 value
  415 + fdtget -tx image.fit /images/kernel/hash-1 value
416 416 c9436464 6427e10f 423837e5 59898ef0 2c97b988
417   - fdtput -tx image.fit /images/kernel@1/hash@1 value c9436464 6427e10f 423837e5 59898ef0 2c97b981
  417 + fdtput -tx image.fit /images/kernel/hash-1 value c9436464 6427e10f 423837e5 59898ef0 2c97b981
418 418  
419 419 Now check it again:
420 420  
... ... @@ -437,7 +437,7 @@
437 437 configuration in any way. Try it with a fresh (valid) image if you like by
438 438 running the mkimage link again. Then:
439 439  
440   - fdtput -p image.fit /configurations/conf@1/signature@2 value fred
  440 + fdtput -p image.fit /configurations/conf-1/signature-1 value fred
441 441 $UOUT/tools/fit_check_sign -f image.fit -k am335x-boneblack-pubkey.dtb
442 442 Verifying Hash Integrity ... -
443 443 sha1,rsa2048:devrsa_verify_with_keynode: RSA failed to verify: -13
444 444  
... ... @@ -521,9 +521,9 @@
521 521 7824930 bytes read in 589 ms (12.7 MiB/s)
522 522 U-Boot# bootm 82000000
523 523 ## Loading kernel from FIT Image at 82000000 ...
524   - Using 'conf@1' configuration
  524 + Using 'conf-1' configuration
525 525 Verifying Hash Integrity ... sha1,rsa2048:dev+ OK
526   - Trying 'kernel@1' kernel subimage
  526 + Trying 'kernel' kernel subimage
527 527 Description: unavailable
528 528 Created: 2014-06-01 19:32:54 UTC
529 529 Type: Kernel Image
... ... @@ -538,8 +538,8 @@
538 538 Hash value: c94364646427e10f423837e559898ef02c97b988
539 539 Verifying Hash Integrity ... sha1+ OK
540 540 ## Loading fdt from FIT Image at 82000000 ...
541   - Using 'conf@1' configuration
542   - Trying 'fdt@1' fdt subimage
  541 + Using 'conf-1' configuration
  542 + Trying 'fdt-1' fdt subimage
543 543 Description: beaglebone-black
544 544 Created: 2014-06-01 19:32:54 UTC
545 545 Type: Flat Device Tree
doc/uImage.FIT/command_syntax_extensions.txt
Diff comments   View file @ 8384040
... ... @@ -138,31 +138,31 @@
138 138  
139 139 Examples:
140 140  
141   -- boot kernel "kernel@1" stored in a new uImage located at 200000:
142   -bootm 200000:kernel@1
  141 +- boot kernel "kernel-1" stored in a new uImage located at 200000:
  142 +bootm 200000:kernel-1
143 143  
144   -- boot configuration "cfg@1" from a new uImage located at 200000:
145   -bootm 200000#cfg@1
  144 +- boot configuration "cfg-1" from a new uImage located at 200000:
  145 +bootm 200000#cfg-1
146 146  
147   -- boot configuration "cfg@1" with extra "cfg@2" from a new uImage located
  147 +- boot configuration "cfg-1" with extra "cfg-2" from a new uImage located
148 148 at 200000:
149   -bootm 200000#cfg@1#cfg@2
  149 +bootm 200000#cfg-1#cfg-2
150 150  
151   -- boot "kernel@1" from a new uImage at 200000 with initrd "ramdisk@2" found in
  151 +- boot "kernel-1" from a new uImage at 200000 with initrd "ramdisk-2" found in
152 152 some other new uImage stored at address 800000:
153   -bootm 200000:kernel@1 800000:ramdisk@2
  153 +bootm 200000:kernel-1 800000:ramdisk-2
154 154  
155   -- boot "kernel@2" from a new uImage at 200000, with initrd "ramdisk@1" and FDT
156   - "fdt@1", both stored in some other new uImage located at 800000:
157   -bootm 200000:kernel@1 800000:ramdisk@1 800000:fdt@1
  155 +- boot "kernel-2" from a new uImage at 200000, with initrd "ramdisk-1" and FDT
  156 + "fdt-1", both stored in some other new uImage located at 800000:
  157 +bootm 200000:kernel-1 800000:ramdisk-1 800000:fdt-1
158 158  
159   -- boot kernel "kernel@2" with initrd "ramdisk@2", both stored in a new uImage
  159 +- boot kernel "kernel-2" with initrd "ramdisk-2", both stored in a new uImage
160 160 at address 200000, with a raw FDT blob stored at address 600000:
161   -bootm 200000:kernel@2 200000:ramdisk@2 600000
  161 +bootm 200000:kernel-2 200000:ramdisk-2 600000
162 162  
163   -- boot kernel "kernel@2" from new uImage at 200000 with FDT "fdt@1" from the
  163 +- boot kernel "kernel-2" from new uImage at 200000 with FDT "fdt-1" from the
164 164 same new uImage:
165   -bootm 200000:kernel@2 - 200000:fdt@1
  165 +bootm 200000:kernel-2 - 200000:fdt-1
166 166  
167 167  
168 168 Note on current image address
169 169  
170 170  
171 171  
172 172  
173 173  
... ... @@ -186,17 +186,17 @@
186 186 commands:
187 187  
188 188 tftp 200000 /tftpboot/uImage
189   -bootm :kernel@1
  189 +bootm :kernel-1
190 190 Last command is equivalent to:
191   -bootm 200000:kernel@1
  191 +bootm 200000:kernel-1
192 192  
193 193 tftp 200000 /tftpboot/uImage
194   -bootm 400000:kernel@1 :ramdisk@1
  194 +bootm 400000:kernel-1 :ramdisk-1
195 195 Last command is equivalent to:
196   -bootm 400000:kernel@1 400000:ramdisk@1
  196 +bootm 400000:kernel-1 400000:ramdisk-1
197 197  
198 198 tftp 200000 /tftpboot/uImage
199   -bootm :kernel@1 400000:ramdisk@1 :fdt@1
  199 +bootm :kernel-1 400000:ramdisk-1 :fdt-1
200 200 Last command is equivalent to:
201   -bootm 200000:kernel@1 400000:ramdisk@1 400000:fdt@1
  201 +bootm 200000:kernel-1 400000:ramdisk-1 400000:fdt-1
doc/uImage.FIT/howto.txt
Diff comments   View file @ 8384040
... ... @@ -86,7 +86,7 @@
86 86 $ mkimage -l kernel.itb
87 87 FIT description: Simple image with single Linux kernel
88 88 Created: Tue Mar 11 17:26:15 2008
89   - Image 0 (kernel@1)
  89 + Image 0 (kernel)
90 90 Description: Vanilla Linux kernel
91 91 Type: Kernel Image
92 92 Compression: gzip compressed
93 93  
... ... @@ -99,10 +99,10 @@
99 99 Hash value: 2ae2bb40
100 100 Hash algo: sha1
101 101 Hash value: 3c200f34e2c226ddc789240cca0c59fc54a67cf4
102   - Default Configuration: 'config@1'
103   - Configuration 0 (config@1)
  102 + Default Configuration: 'config-1'
  103 + Configuration 0 (config-1)
104 104 Description: Boot Linux kernel
105   - Kernel: kernel@1
  105 + Kernel: kernel
106 106  
107 107  
108 108 The resulting image file kernel.itb can be now transferred to the target,
... ... @@ -130,7 +130,7 @@
130 130 FIT image found
131 131 FIT description: Simple image with single Linux kernel
132 132 Created: 2008-03-11 16:26:15 UTC
133   - Image 0 (kernel@1)
  133 + Image 0 (kernel)
134 134 Description: Vanilla Linux kernel
135 135 Type: Kernel Image
136 136 Compression: gzip compressed
137 137  
138 138  
... ... @@ -144,15 +144,15 @@
144 144 Hash value: 2ae2bb40
145 145 Hash algo: sha1
146 146 Hash value: 3c200f34e2c226ddc789240cca0c59fc54a67cf4
147   - Default Configuration: 'config@1'
148   - Configuration 0 (config@1)
  147 + Default Configuration: 'config-1'
  148 + Configuration 0 (config-1)
149 149 Description: Boot Linux kernel
150   - Kernel: kernel@1
  150 + Kernel: kernel
151 151  
152 152 => bootm
153 153 ## Booting kernel from FIT Image at 00900000 ...
154   - Using 'config@1' configuration
155   - Trying 'kernel@1' kernel subimage
  154 + Using 'config-1' configuration
  155 + Trying 'kernel' kernel subimage
156 156 Description: Vanilla Linux kernel
157 157 Type: Kernel Image
158 158 Compression: gzip compressed
... ... @@ -196,7 +196,7 @@
196 196 $ mkimage -l kernel_fdt.itb
197 197 FIT description: Simple image with single Linux kernel and FDT blob
198 198 Created: Tue Mar 11 16:29:22 2008
199   - Image 0 (kernel@1)
  199 + Image 0 (kernel)
200 200 Description: Vanilla Linux kernel
201 201 Type: Kernel Image
202 202 Compression: gzip compressed
... ... @@ -209,7 +209,7 @@
209 209 Hash value: 2c0cc807
210 210 Hash algo: sha1
211 211 Hash value: 264b59935470e42c418744f83935d44cdf59a3bb
212   - Image 1 (fdt@1)
  212 + Image 1 (fdt-1)
213 213 Description: Flattened Device Tree blob
214 214 Type: Flat Device Tree
215 215 Compression: uncompressed
216 216  
... ... @@ -219,11 +219,11 @@
219 219 Hash value: 0d655d71
220 220 Hash algo: sha1
221 221 Hash value: 25ab4e15cd4b8a5144610394560d9c318ce52def
222   - Default Configuration: 'conf@1'
223   - Configuration 0 (conf@1)
  222 + Default Configuration: 'conf-1'
  223 + Configuration 0 (conf-1)
224 224 Description: Boot Linux kernel with FDT blob
225   - Kernel: kernel@1
226   - FDT: fdt@1
  225 + Kernel: kernel
  226 + FDT: fdt-1
227 227  
228 228  
229 229 The resulting image file kernel_fdt.itb can be now transferred to the target,
... ... @@ -245,7 +245,7 @@
245 245 FIT image found
246 246 FIT description: Simple image with single Linux kernel and FDT blob
247 247 Created: 2008-03-11 15:29:22 UTC
248   - Image 0 (kernel@1)
  248 + Image 0 (kernel)
249 249 Description: Vanilla Linux kernel
250 250 Type: Kernel Image
251 251 Compression: gzip compressed
... ... @@ -259,7 +259,7 @@
259 259 Hash value: 2c0cc807
260 260 Hash algo: sha1
261 261 Hash value: 264b59935470e42c418744f83935d44cdf59a3bb
262   - Image 1 (fdt@1)
  262 + Image 1 (fdt-1)
263 263 Description: Flattened Device Tree blob
264 264 Type: Flat Device Tree
265 265 Compression: uncompressed
266 266  
267 267  
... ... @@ -270,15 +270,15 @@
270 270 Hash value: 0d655d71
271 271 Hash algo: sha1
272 272 Hash value: 25ab4e15cd4b8a5144610394560d9c318ce52def
273   - Default Configuration: 'conf@1'
274   - Configuration 0 (conf@1)
  273 + Default Configuration: 'conf-1'
  274 + Configuration 0 (conf-1)
275 275 Description: Boot Linux kernel with FDT blob
276   - Kernel: kernel@1
277   - FDT: fdt@1
  276 + Kernel: kernel
  277 + FDT: fdt-1
278 278 => bootm
279 279 ## Booting kernel from FIT Image at 00900000 ...
280   - Using 'conf@1' configuration
281   - Trying 'kernel@1' kernel subimage
  280 + Using 'conf-1' configuration
  281 + Trying 'kernel' kernel subimage
282 282 Description: Vanilla Linux kernel
283 283 Type: Kernel Image
284 284 Compression: gzip compressed
... ... @@ -295,8 +295,8 @@
295 295 Verifying Hash Integrity ... crc32+ sha1+ OK
296 296 Uncompressing Kernel Image ... OK
297 297 ## Flattened Device Tree from FIT Image at 00900000
298   - Using 'conf@1' configuration
299   - Trying 'fdt@1' FDT blob subimage
  298 + Using 'conf-1' configuration
  299 + Trying 'fdt-1' FDT blob subimage
300 300 Description: Flattened Device Tree blob
301 301 Type: Flat Device Tree
302 302 Compression: uncompressed
doc/uImage.FIT/overlay-fdt-boot.txt
Diff comments   View file @ 8384040
... ... @@ -24,7 +24,7 @@
24 24 /dts-v1/;
25 25 / {
26 26 images {
27   - kernel@1 {
  27 + kernel {
28 28 data = /incbin/("./zImage");
29 29 type = "kernel";
30 30 arch = "arm";
31 31  
32 32  
33 33  
34 34  
35 35  
... ... @@ -32,32 +32,32 @@
32 32 load = <0x82000000>;
33 33 entry = <0x82000000>;
34 34 };
35   - fdt@1 {
  35 + fdt-1 {
36 36 data = /incbin/("./foo-reva.dtb");
37 37 type = "flat_dt";
38 38 arch = "arm";
39 39 };
40   - fdt@2 {
  40 + fdt-2 {
41 41 data = /incbin/("./foo-revb.dtb");
42 42 type = "flat_dt";
43 43 arch = "arm";
44 44 };
45   - fdt@3 {
  45 + fdt-3 {
46 46 data = /incbin/("./foo-reva-bar.dtb");
47 47 type = "flat_dt";
48 48 arch = "arm";
49 49 };
50   - fdt@4 {
  50 + fdt-4 {
51 51 data = /incbin/("./foo-revb-bar.dtb");
52 52 type = "flat_dt";
53 53 arch = "arm";
54 54 };
55   - fdt@5 {
  55 + fdt-5 {
56 56 data = /incbin/("./foo-revb-baz.dtb");
57 57 type = "flat_dt";
58 58 arch = "arm";
59 59 };
60   - fdt@6 {
  60 + fdt-6 {
61 61 data = /incbin/("./foo-revb-bar-baz.dtb");
62 62 type = "flat_dt";
63 63 arch = "arm";
64 64  
65 65  
66 66  
67 67  
68 68  
... ... @@ -67,28 +67,28 @@
67 67 configurations {
68 68 default = "foo-reva.dtb;
69 69 foo-reva.dtb {
70   - kernel = "kernel@1";
71   - fdt = "fdt@1";
  70 + kernel = "kernel";
  71 + fdt = "fdt-1";
72 72 };
73 73 foo-revb.dtb {
74   - kernel = "kernel@1";
75   - fdt = "fdt@2";
  74 + kernel = "kernel";
  75 + fdt = "fdt-2";
76 76 };
77 77 foo-reva-bar.dtb {
78   - kernel = "kernel@1";
79   - fdt = "fdt@3";
  78 + kernel = "kernel";
  79 + fdt = "fdt-3";
80 80 };
81 81 foo-revb-bar.dtb {
82   - kernel = "kernel@1";
83   - fdt = "fdt@4";
  82 + kernel = "kernel";
  83 + fdt = "fdt-4";
84 84 };
85 85 foo-revb-baz.dtb {
86   - kernel = "kernel@1";
87   - fdt = "fdt@5";
  86 + kernel = "kernel";
  87 + fdt = "fdt-5";
88 88 };
89 89 foo-revb-bar-baz.dtb {
90   - kernel = "kernel@1";
91   - fdt = "fdt@6";
  90 + kernel = "kernel";
  91 + fdt = "fdt-6";
92 92 };
93 93 };
94 94 };
... ... @@ -117,7 +117,7 @@
117 117 /dts-v1/;
118 118 / {
119 119 images {
120   - kernel@1 {
  120 + kernel {
121 121 data = /incbin/("./zImage");
122 122 type = "kernel";
123 123 arch = "arm";
124 124  
125 125  
126 126  
127 127  
... ... @@ -125,31 +125,31 @@
125 125 load = <0x82000000>;
126 126 entry = <0x82000000>;
127 127 };
128   - fdt@1 {
  128 + fdt-1 {
129 129 data = /incbin/("./foo.dtb");
130 130 type = "flat_dt";
131 131 arch = "arm";
132 132 load = <0x87f00000>;
133 133 };
134   - fdt@2 {
  134 + fdt-2 {
135 135 data = /incbin/("./reva.dtbo");
136 136 type = "flat_dt";
137 137 arch = "arm";
138 138 load = <0x87fc0000>;
139 139 };
140   - fdt@3 {
  140 + fdt-3 {
141 141 data = /incbin/("./revb.dtbo");
142 142 type = "flat_dt";
143 143 arch = "arm";
144 144 load = <0x87fc0000>;
145 145 };
146   - fdt@4 {
  146 + fdt-4 {
147 147 data = /incbin/("./bar.dtbo");
148 148 type = "flat_dt";
149 149 arch = "arm";
150 150 load = <0x87fc0000>;
151 151 };
152   - fdt@5 {
  152 + fdt-5 {
153 153 data = /incbin/("./baz.dtbo");
154 154 type = "flat_dt";
155 155 arch = "arm";
156 156  
157 157  
158 158  
159 159  
160 160  
161 161  
162 162  
... ... @@ -160,34 +160,34 @@
160 160 configurations {
161 161 default = "foo-reva.dtb;
162 162 foo-reva.dtb {
163   - kernel = "kernel@1";
164   - fdt = "fdt@1", "fdt@2";
  163 + kernel = "kernel";
  164 + fdt = "fdt-1", "fdt-2";
165 165 };
166 166 foo-revb.dtb {
167   - kernel = "kernel@1";
168   - fdt = "fdt@1", "fdt@3";
  167 + kernel = "kernel";
  168 + fdt = "fdt-1", "fdt-3";
169 169 };
170 170 foo-reva-bar.dtb {
171   - kernel = "kernel@1";
172   - fdt = "fdt@1", "fdt@2", "fdt@4";
  171 + kernel = "kernel";
  172 + fdt = "fdt-1", "fdt-2", "fdt-4";
173 173 };
174 174 foo-revb-bar.dtb {
175   - kernel = "kernel@1";
176   - fdt = "fdt@1", "fdt@3", "fdt@4";
  175 + kernel = "kernel";
  176 + fdt = "fdt-1", "fdt-3", "fdt-4";
177 177 };
178 178 foo-revb-baz.dtb {
179   - kernel = "kernel@1";
180   - fdt = "fdt@1", "fdt@3", "fdt@5";
  179 + kernel = "kernel";
  180 + fdt = "fdt-1", "fdt-3", "fdt-5";
181 181 };
182 182 foo-revb-bar-baz.dtb {
183   - kernel = "kernel@1";
184   - fdt = "fdt@1", "fdt@3", "fdt@4", "fdt@5";
  183 + kernel = "kernel";
  184 + fdt = "fdt-1", "fdt-3", "fdt-4", "fdt-5";
185 185 };
186 186 bar {
187   - fdt = "fdt@4";
  187 + fdt = "fdt-4";
188 188 };
189 189 baz {
190   - fdt = "fdt@5";
  190 + fdt = "fdt-5";
191 191 };
192 192 };
193 193 };
doc/uImage.FIT/signature.txt
Diff comments   View file @ 8384040
... ... @@ -83,7 +83,7 @@
83 83 The following properties are required in the FIT's signature node(s) to
84 84 allow the signer to operate. These should be added to the .its file.
85 85 Signature nodes sit at the same level as hash nodes and are called
86   -signature@1, signature@2, etc.
  86 +signature-1, signature-2, etc.
87 87  
88 88 - algo: Algorithm name (e.g. "sha1,rsa2048")
89 89  
... ... @@ -118,9 +118,9 @@
118 118 - hashed-nodes: A list of nodes which were hashed by the signer. Each is
119 119 a string - the full path to node. A typical value might be:
120 120  
121   - hashed-nodes = "/", "/configurations/conf@1", "/images/kernel@1",
122   - "/images/kernel@1/hash@1", "/images/fdt@1",
123   - "/images/fdt@1/hash@1";
  121 + hashed-nodes = "/", "/configurations/conf-1", "/images/kernel",
  122 + "/images/kernel/hash-1", "/images/fdt-1",
  123 + "/images/fdt-1/hash-1";
124 124  
125 125 - hashed-strings: The start and size of the string region of the FIT that
126 126 was hashed
127 127  
128 128  
129 129  
130 130  
131 131  
132 132  
133 133  
134 134  
135 135  
... ... @@ -178,44 +178,44 @@
178 178  
179 179 / {
180 180 images {
181   - kernel@1 {
  181 + kernel-1 {
182 182 data = <data for kernel1>
183   - signature@1 {
  183 + signature-1 {
184 184 algo = "sha1,rsa2048";
185 185 value = <...kernel signature 1...>
186 186 };
187 187 };
188   - kernel@2 {
  188 + kernel-2 {
189 189 data = <data for kernel2>
190   - signature@1 {
  190 + signature-1 {
191 191 algo = "sha1,rsa2048";
192 192 value = <...kernel signature 2...>
193 193 };
194 194 };
195   - fdt@1 {
  195 + fdt-1 {
196 196 data = <data for fdt1>;
197   - signature@1 {
  197 + signature-1 {
198 198 algo = "sha1,rsa2048";
199 199 vaue = <...fdt signature 1...>
200 200 };
201 201 };
202   - fdt@2 {
  202 + fdt-2 {
203 203 data = <data for fdt2>;
204   - signature@1 {
  204 + signature-1 {
205 205 algo = "sha1,rsa2048";
206 206 vaue = <...fdt signature 2...>
207 207 };
208 208 };
209 209 };
210 210 configurations {
211   - default = "conf@1";
212   - conf@1 {
213   - kernel = "kernel@1";
214   - fdt = "fdt@1";
  211 + default = "conf-1";
  212 + conf-1 {
  213 + kernel = "kernel-1";
  214 + fdt = "fdt-1";
215 215 };
216   - conf@1 {
217   - kernel = "kernel@2";
218   - fdt = "fdt@2";
  216 + conf-1 {
  217 + kernel = "kernel-2";
  218 + fdt = "fdt-2";
219 219 };
220 220 };
221 221 };
222 222  
223 223  
... ... @@ -224,18 +224,18 @@
224 224 configuration 3 with kernel 1 and fdt 2:
225 225  
226 226 configurations {
227   - default = "conf@1";
228   - conf@1 {
229   - kernel = "kernel@1";
230   - fdt = "fdt@1";
  227 + default = "conf-1";
  228 + conf-1 {
  229 + kernel = "kernel-1";
  230 + fdt = "fdt-1";
231 231 };
232   - conf@1 {
233   - kernel = "kernel@2";
234   - fdt = "fdt@2";
  232 + conf-1 {
  233 + kernel = "kernel-2";
  234 + fdt = "fdt-2";
235 235 };
236   - conf@3 {
237   - kernel = "kernel@1";
238   - fdt = "fdt@2";
  236 + conf-3 {
  237 + kernel = "kernel-1";
  238 + fdt = "fdt-2";
239 239 };
240 240 };
241 241  
242 242  
243 243  
244 244  
245 245  
246 246  
247 247  
248 248  
249 249  
250 250  
... ... @@ -250,49 +250,49 @@
250 250  
251 251 / {
252 252 images {
253   - kernel@1 {
  253 + kernel-1 {
254 254 data = <data for kernel1>
255   - hash@1 {
  255 + hash-1 {
256 256 algo = "sha1";
257 257 value = <...kernel hash 1...>
258 258 };
259 259 };
260   - kernel@2 {
  260 + kernel-2 {
261 261 data = <data for kernel2>
262   - hash@1 {
  262 + hash-1 {
263 263 algo = "sha1";
264 264 value = <...kernel hash 2...>
265 265 };
266 266 };
267   - fdt@1 {
  267 + fdt-1 {
268 268 data = <data for fdt1>;
269   - hash@1 {
  269 + hash-1 {
270 270 algo = "sha1";
271 271 value = <...fdt hash 1...>
272 272 };
273 273 };
274   - fdt@2 {
  274 + fdt-2 {
275 275 data = <data for fdt2>;
276   - hash@1 {
  276 + hash-1 {
277 277 algo = "sha1";
278 278 value = <...fdt hash 2...>
279 279 };
280 280 };
281 281 };
282 282 configurations {
283   - default = "conf@1";
284   - conf@1 {
285   - kernel = "kernel@1";
286   - fdt = "fdt@1";
287   - signature@1 {
  283 + default = "conf-1";
  284 + conf-1 {
  285 + kernel = "kernel-1";
  286 + fdt = "fdt-1";
  287 + signature-1 {
288 288 algo = "sha1,rsa2048";
289 289 value = <...conf 1 signature...>;
290 290 };
291 291 };
292   - conf@2 {
293   - kernel = "kernel@2";
294   - fdt = "fdt@2";
295   - signature@1 {
  292 + conf-2 {
  293 + kernel = "kernel-2";
  294 + fdt = "fdt-2";
  295 + signature-1 {
296 296 algo = "sha1,rsa2048";
297 297 value = <...conf 1 signature...>;
298 298 };
299 299  
... ... @@ -303,11 +303,11 @@
303 303  
304 304 You can see that we have added hashes for all images (since they are no
305 305 longer signed), and a signature to each configuration. In the above example,
306   -mkimage will sign configurations/conf@1, the kernel and fdt that are
307   -pointed to by the configuration (/images/kernel@1, /images/kernel@1/hash@1,
308   -/images/fdt@1, /images/fdt@1/hash@1) and the root structure of the image
  306 +mkimage will sign configurations/conf-1, the kernel and fdt that are
  307 +pointed to by the configuration (/images/kernel-1, /images/kernel-1/hash-1,
  308 +/images/fdt-1, /images/fdt-1/hash-1) and the root structure of the image
309 309 (so that it isn't possible to add or remove root nodes). The signature is
310   -written into /configurations/conf@1/signature@1/value. It can easily be
  310 +written into /configurations/conf-1/signature-1/value. It can easily be
311 311 verified later even if the FIT has been signed with other keys in the
312 312 meantime.
313 313  
doc/uImage.FIT/source_file_format.txt
Diff comments   View file @ 8384040
... ... @@ -102,15 +102,15 @@
102 102 |
103 103 o images
104 104 | |
105   - | o image@1 {...}
106   - | o image@2 {...}
  105 + | o image-1 {...}
  106 + | o image-2 {...}
107 107 | ...
108 108 |
109 109 o configurations
110   - |- default = "conf@1"
  110 + |- default = "conf-1"
111 111 |
112   - o conf@1 {...}
113   - o conf@2 {...}
  112 + o conf-1 {...}
  113 + o conf-2 {...}
114 114 ...
115 115  
116 116  
... ... @@ -142,7 +142,7 @@
142 142 This node is a container node for component sub-image nodes. Each sub-node of
143 143 the '/images' node should have the following layout:
144 144  
145   - o image@1
  145 + o image-1
146 146 |- description = "component sub-image description"
147 147 |- data = /incbin/("path/to/data/file.bin")
148 148 |- type = "sub-image type name"
... ... @@ -152,8 +152,8 @@
152 152 |- load = <00000000>
153 153 |- entry = <00000000>
154 154 |
155   - o hash@1 {...}
156   - o hash@2 {...}
  155 + o hash-1 {...}
  156 + o hash-2 {...}
157 157 ...
158 158  
159 159 Mandatory properties:
160 160  
... ... @@ -183,14 +183,14 @@
183 183 property of the root node. Mandatory for types: "standalone" and "kernel".
184 184  
185 185 Optional nodes:
186   - - hash@1 : Each hash sub-node represents separate hash or checksum
  186 + - hash-1 : Each hash sub-node represents separate hash or checksum
187 187 calculated for node's data according to specified algorithm.
188 188  
189 189  
190 190 5) Hash nodes
191 191 -------------
192 192  
193   -o hash@1
  193 +o hash-1
194 194 |- algo = "hash or checksum algorithm name"
195 195 |- value = [hash or checksum value]
196 196  
... ... @@ -212,8 +212,8 @@
212 212 o configurations
213 213 |- default = "default configuration sub-node unit name"
214 214 |
215   - o config@1 {...}
216   - o config@2 {...}
  215 + o config-1 {...}
  216 + o config-2 {...}
217 217 ...
218 218  
219 219  
... ... @@ -231,7 +231,7 @@
231 231  
232 232 Each configuration has the following structure:
233 233  
234   -o config@1
  234 +o config-1
235 235 |- description = "configuration description"
236 236 |- kernel = "kernel sub-node unit name"
237 237 |- ramdisk = "ramdisk sub-node unit name"
doc/uImage.FIT/x86-fit-boot.txt
Diff comments   View file @ 8384040
... ... @@ -197,7 +197,7 @@
197 197 $ dumpimage -l image.fit
198 198 FIT description: Simple image with single Linux kernel on x86
199 199 Created: Tue Oct 7 10:57:24 2014
200   - Image 0 (kernel@1)
  200 + Image 0 (kernel)
201 201 Description: Vanilla Linux kernel
202 202 Created: Tue Oct 7 10:57:24 2014
203 203 Type: Kernel Image
... ... @@ -209,7 +209,7 @@
209 209 Entry Point: 0x00000000
210 210 Hash algo: sha1
211 211 Hash value: 446b5163ebfe0fb6ee20cbb7a8501b263cd92392
212   - Image 1 (setup@1)
  212 + Image 1 (setup)
213 213 Description: Linux setup.bin
214 214 Created: Tue Oct 7 10:57:24 2014
215 215 Type: x86 setup.bin
216 216  
... ... @@ -217,10 +217,10 @@
217 217 Data Size: 12912 Bytes = 12.61 kB = 0.01 MB
218 218 Hash algo: sha1
219 219 Hash value: a1f2099cf47ff9816236cd534c77af86e713faad
220   - Default Configuration: 'config@1'
221   - Configuration 0 (config@1)
  220 + Default Configuration: 'config-1'
  221 + Configuration 0 (config-1)
222 222 Description: Boot Linux kernel
223   - Kernel: kernel@1
  223 + Kernel: kernel
224 224  
225 225  
226 226 Booting the FIT