Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86

[oweals/u-boot.git] / doc / uImage.FIT / kernel.its

diff --git a/doc/uImage.FIT/kernel.its b/doc/uImage.FIT/kernel.its
index d1a5939115272a62958f19d21aa23193a7f42089..77ddf622deb84da04e3be6859da884496b39d6a5 100644 (file)
--- a/doc/uImage.FIT/kernel.its
+++ b/doc/uImage.FIT/kernel.its
@@ -1,12 +1,15 @@
 /*
- * Simple U-boot uImage source file containing a single kernel
+ * Simple U-Boot uImage source file containing a single kernel
  */
+
+/dts-v1/;
+
 / {
        description = "Simple image with single Linux kernel";
        #address-cells = <1>;
 
        images {
-               kernel@1 {
+               kernel {
                        description = "Vanilla Linux kernel";
                        data = /incbin/("./vmlinux.bin.gz");
                        type = "kernel";
@@ -15,20 +18,74 @@
                        compression = "gzip";
                        load = <00000000>;
                        entry = <00000000>;
-                       hash@1 {
+                       hash-1 {
                                algo = "crc32";
                        };
-                       hash@2 {
+                       hash-2 {
+                               algo = "sha1";
+                       };
+               };
+       };
+
+       configurations {
+               default = "config-1";
+               config-1 {
+                       description = "Boot Linux kernel";
+                       kernel = "kernel";
+               };
+       };
+};
+
+
+
+For x86 a setup node is also required: see x86-fit-boot.txt.
+
+/dts-v1/;
+
+/ {
+       description = "Simple image with single Linux kernel on x86";
+       #address-cells = <1>;
+
+       images {
+               kernel {
+                       description = "Vanilla Linux kernel";
+                       data = /incbin/("./image.bin.lzo");
+                       type = "kernel";
+                       arch = "x86";
+                       os = "linux";
+                       compression = "lzo";
+                       load = <0x01000000>;
+                       entry = <0x00000000>;
+                       hash-2 {
+                               algo = "sha1";
+                       };
+               };
+
+               setup {
+                       description = "Linux setup.bin";
+                       data = /incbin/("./setup.bin");
+                       type = "x86_setup";
+                       arch = "x86";
+                       os = "linux";
+                       compression = "none";
+                       load = <0x00090000>;
+                       entry = <0x00090000>;
+                       hash-2 {
                                algo = "sha1";
                        };
                };
        };
 
        configurations {
-               default = "config@1";
-               config@1 {
+               default = "config-1";
+               config-1 {
                        description = "Boot Linux kernel";
-                       kernel = "kernel@1";
+                       kernel = "kernel";
+                       setup = "setup";
                };
        };
 };
+
+Note: the above assumes a 32-bit kernel. To directly boot a 64-bit kernel,
+change both arch values to "x86_64". U-Boot will then change to 64-bit mode
+before booting the kernel (see boot_linux_kernel()).