Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / doc / uImage.FIT / multi.its

diff --git a/doc/uImage.FIT/multi.its b/doc/uImage.FIT/multi.its
index 1d8c2dbf90580e095c75a2d56222e4fd201d0ee0..26c8dad6a2b204177c1bb4bd527c71dbcc5714df 100644 (file)
--- a/doc/uImage.FIT/multi.its
+++ b/doc/uImage.FIT/multi.its
@@ -1,12 +1,15 @@
 /*
- * U-boot uImage source file with multiple kernels, ramdisks and FDT blobs
+ * U-Boot uImage source file with multiple kernels, ramdisks and FDT blobs
  */
+
+/dts-v1/;
+
 / {
        description = "Various kernels, ramdisks and FDT blobs";
        #address-cells = <1>;
 
        images {
-               kernel@1 {
+               kernel-1 {
                        description = "vanilla-2.6.23";
                        data = /incbin/("./vmlinux.bin.gz");
                        type = "kernel";
@@ -15,15 +18,15 @@
                        compression = "gzip";
                        load = <00000000>;
                        entry = <00000000>;
-                       hash@1 {
+                       hash-1 {
                                algo = "md5";
                        };
-                       hash@2 {
+                       hash-2 {
                                algo = "sha1";
                        };
                };
 
-               kernel@2 {
+               kernel-2 {
                        description = "2.6.23-denx";
                        data = /incbin/("./2.6.23-denx.bin.gz");
                        type = "kernel";
@@ -32,12 +35,12 @@
                        compression = "gzip";
                        load = <00000000>;
                        entry = <00000000>;
-                       hash@1 {
+                       hash-1 {
                                algo = "sha1";
                        };
                };
 
-               kernel@3 {
+               kernel-3 {
                        description = "2.4.25-denx";
                        data = /incbin/("./2.4.25-denx.bin.gz");
                        type = "kernel";
@@ -46,54 +49,58 @@
                        compression = "gzip";
                        load = <00000000>;
                        entry = <00000000>;
-                       hash@1 {
+                       hash-1 {
                                algo = "md5";
                        };
                };
 
-               ramdisk@1 {
+               ramdisk-1 {
                        description = "eldk-4.2-ramdisk";
                        data = /incbin/("./eldk-4.2-ramdisk");
                        type = "ramdisk";
                        arch = "ppc";
                        os = "linux";
                        compression = "gzip";
-                       hash@1 {
+                       load = <00000000>;
+                       entry = <00000000>;
+                       hash-1 {
                                algo = "sha1";
                        };
                };
 
-               ramdisk@2 {
+               ramdisk-2 {
                        description = "eldk-3.1-ramdisk";
                        data = /incbin/("./eldk-3.1-ramdisk");
                        type = "ramdisk";
                        arch = "ppc";
                        os = "linux";
                        compression = "gzip";
-                       hash@1 {
+                       load = <00000000>;
+                       entry = <00000000>;
+                       hash-1 {
                                algo = "crc32";
                        };
                };
 
-               fdt@1 {
+               fdt-1 {
                        description = "tqm5200-fdt";
                        data = /incbin/("./tqm5200.dtb");
                        type = "flat_dt";
                        arch = "ppc";
                        compression = "none";
-                       hash@1 {
+                       hash-1 {
                                algo = "crc32";
                        };
                };
 
-               fdt@2 {
+               fdt-2 {
                        description = "tqm5200s-fdt";
                        data = /incbin/("./tqm5200s.dtb");
                        type = "flat_dt";
                        arch = "ppc";
                        compression = "none";
                        load = <00700000>;
-                       hash@1 {
+                       hash-1 {
                                algo = "sha1";
                        };
                };
@@ -101,26 +108,26 @@
        };
 
        configurations {
-               default = "config@1";
+               default = "config-1";
 
-               config@1 {
+               config-1 {
                        description = "tqm5200 vanilla-2.6.23 configuration";
-                       kernel = "kernel@1";
-                       ramdisk = "ramdisk@1";
-                       fdt = "fdt@1";
+                       kernel = "kernel-1";
+                       ramdisk = "ramdisk-1";
+                       fdt = "fdt-1";
                };
 
-               config@2 {
+               config-2 {
                        description = "tqm5200s denx-2.6.23 configuration";
-                       kernel = "kernel@2";
-                       ramdisk = "ramdisk@1";
-                       fdt = "fdt@2";
+                       kernel = "kernel-2";
+                       ramdisk = "ramdisk-1";
+                       fdt = "fdt-2";
                };
 
-               config@3 {
+               config-3 {
                        description = "tqm5200s denx-2.4.25 configuration";
-                       kernel = "kernel@3";
-                       ramdisk = "ramdisk@2";
+                       kernel = "kernel-3";
+                       ramdisk = "ramdisk-2";
                };
        };
 };