From 438a4c11260b4ea9805039b0b4f92f9df5306b02 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Wed, 26 Mar 2008 11:48:46 +0100 Subject: Cleanup coding style, update CHANGELOG Signed-off-by: Wolfgang Denk --- doc/uImage.FIT/command_syntax_extensions.txt | 24 +++--- doc/uImage.FIT/howto.txt | 106 +++++++++++++-------------- doc/uImage.FIT/source_file_format.txt | 8 +- 3 files changed, 69 insertions(+), 69 deletions(-) (limited to 'doc') diff --git a/doc/uImage.FIT/command_syntax_extensions.txt b/doc/uImage.FIT/command_syntax_extensions.txt index b8b50ffae9..6185cd838c 100644 --- a/doc/uImage.FIT/command_syntax_extensions.txt +++ b/doc/uImage.FIT/command_syntax_extensions.txt @@ -23,15 +23,15 @@ kernel is passed a pointer to the FDT. The boot method is indicated for each scenario. -1. bootm boot image at the current address, equivalent to 2,3,8 +1. bootm boot image at the current address, equivalent to 2,3,8 Old uImage: -2. bootm /* single image at */ -3. bootm /* multi-image at */ -4. bootm - /* multi-image at */ -5. bootm /* single image at */ +2. bootm /* single image at */ +3. bootm /* multi-image at */ +4. bootm - /* multi-image at */ +5. bootm /* single image at */ 6. bootm /* single image at */ -7. bootm - /* single image at */ +7. bootm - /* single image at */ New uImage: 8. bootm @@ -40,8 +40,8 @@ New uImage: 11. bootm []: []: 12. bootm []: []: []: 13. bootm []: []: -14. bootm []: - []: -15. bootm []: - +14. bootm []: - []: +15. bootm []: - Ad. 1. This is equivalent to cases 2,3,8, depending on the type of image at @@ -57,11 +57,11 @@ with the ramdisk from the image. - boot method: depends on the number of components at , and on whether U-Boot is compiled with OF support: - | 2 components | 3 components | - | (kernel, initrd) | (kernel, initrd, fdt) | + | 2 components | 3 components | + | (kernel, initrd) | (kernel, initrd, fdt) | --------------------------------------------------------------------- -#ifdef CONFIG_OF_* | non-FDT | FDT | -#ifndef CONFIG_OF_* | non-FDT | non-FDT | +#ifdef CONFIG_OF_* | non-FDT | FDT | +#ifndef CONFIG_OF_* | non-FDT | non-FDT | Ad. 4. Similar to case 3, but the kernel is booted without initrd. Second component of the multi-image is irrelevant (it can be a dummy, 1-byte file). diff --git a/doc/uImage.FIT/howto.txt b/doc/uImage.FIT/howto.txt index 4ae5303b34..8065e9e1d8 100644 --- a/doc/uImage.FIT/howto.txt +++ b/doc/uImage.FIT/howto.txt @@ -37,8 +37,8 @@ To summarize the prerequisites needed for new uImage creation: Here's a graphical overview of the image creation and booting process: -image source file mkimage + dtc transfer to target - + ---------------> image file --------------------> bootm +image source file mkimage + dtc transfer to target + + ---------------> image file --------------------> bootm image data files(s) @@ -61,24 +61,24 @@ DTC: dts->dtb on file "kernel.its" $ $ mkimage -l kernel.itb FIT description: Simple image with single Linux kernel -Created: Tue Mar 11 17:26:15 2008 +Created: Tue Mar 11 17:26:15 2008 Image 0 (kernel@1) - Description: Vanilla Linux kernel - Type: Kernel Image - Compression: gzip compressed - Data Size: 943347 Bytes = 921.24 kB = 0.90 MB + Description: Vanilla Linux kernel + Type: Kernel Image + Compression: gzip compressed + Data Size: 943347 Bytes = 921.24 kB = 0.90 MB Architecture: PowerPC - OS: Linux + OS: Linux Load Address: 0x00000000 - Entry Point: 0x00000000 - Hash algo: crc32 - Hash value: 2ae2bb40 - Hash algo: sha1 - Hash value: 3c200f34e2c226ddc789240cca0c59fc54a67cf4 + Entry Point: 0x00000000 + Hash algo: crc32 + Hash value: 2ae2bb40 + Hash algo: sha1 + Hash value: 3c200f34e2c226ddc789240cca0c59fc54a67cf4 Default Configuration: 'config@1' Configuration 0 (config@1) - Description: Boot Linux kernel - Kernel: kernel@1 + Description: Boot Linux kernel + Kernel: kernel@1 The resulting image file kernel.itb can be now transferred to the target, @@ -105,15 +105,15 @@ Bytes transferred = 944464 (e6950 hex) ## Checking Image at 00900000 ... FIT image found FIT description: Simple image with single Linux kernel - Created: 2008-03-11 16:26:15 UTC + Created: 2008-03-11 16:26:15 UTC Image 0 (kernel@1) Description: Vanilla Linux kernel - Type: Kernel Image + Type: Kernel Image Compression: gzip compressed Data Start: 0x009000e0 Data Size: 943347 Bytes = 921.2 kB Architecture: PowerPC - OS: Linux + OS: Linux Load Address: 0x00000000 Entry Point: 0x00000000 Hash algo: crc32 @@ -123,19 +123,19 @@ Bytes transferred = 944464 (e6950 hex) Default Configuration: 'config@1' Configuration 0 (config@1) Description: Boot Linux kernel - Kernel: kernel@1 + Kernel: kernel@1 => bootm ## Booting kernel from FIT Image at 00900000 ... Using 'config@1' configuration Trying 'kernel@1' kernel subimage Description: Vanilla Linux kernel - Type: Kernel Image + Type: Kernel Image Compression: gzip compressed Data Start: 0x009000e0 Data Size: 943347 Bytes = 921.2 kB Architecture: PowerPC - OS: Linux + OS: Linux Load Address: 0x00000000 Entry Point: 0x00000000 Hash algo: crc32 @@ -171,35 +171,35 @@ DTC: dts->dtb on file "kernel_fdt.its" $ $ mkimage -l kernel_fdt.itb FIT description: Simple image with single Linux kernel and FDT blob -Created: Tue Mar 11 16:29:22 2008 +Created: Tue Mar 11 16:29:22 2008 Image 0 (kernel@1) - Description: Vanilla Linux kernel - Type: Kernel Image - Compression: gzip compressed - Data Size: 1092037 Bytes = 1066.44 kB = 1.04 MB + Description: Vanilla Linux kernel + Type: Kernel Image + Compression: gzip compressed + Data Size: 1092037 Bytes = 1066.44 kB = 1.04 MB Architecture: PowerPC - OS: Linux + OS: Linux Load Address: 0x00000000 - Entry Point: 0x00000000 - Hash algo: crc32 - Hash value: 2c0cc807 - Hash algo: sha1 - Hash value: 264b59935470e42c418744f83935d44cdf59a3bb + Entry Point: 0x00000000 + Hash algo: crc32 + Hash value: 2c0cc807 + Hash algo: sha1 + Hash value: 264b59935470e42c418744f83935d44cdf59a3bb Image 1 (fdt@1) - Description: Flattened Device Tree blob - Type: Flat Device Tree - Compression: uncompressed - Data Size: 16384 Bytes = 16.00 kB = 0.02 MB + Description: Flattened Device Tree blob + Type: Flat Device Tree + Compression: uncompressed + Data Size: 16384 Bytes = 16.00 kB = 0.02 MB Architecture: PowerPC - Hash algo: crc32 - Hash value: 0d655d71 - Hash algo: sha1 - Hash value: 25ab4e15cd4b8a5144610394560d9c318ce52def + Hash algo: crc32 + Hash value: 0d655d71 + Hash algo: sha1 + Hash value: 25ab4e15cd4b8a5144610394560d9c318ce52def Default Configuration: 'conf@1' Configuration 0 (conf@1) - Description: Boot Linux kernel with FDT blob - Kernel: kernel@1 - FDT: fdt@1 + Description: Boot Linux kernel with FDT blob + Kernel: kernel@1 + FDT: fdt@1 The resulting image file kernel_fdt.itb can be now transferred to the target, @@ -212,7 +212,7 @@ TFTP from server 192.168.1.1; our IP address is 192.168.160.5 Filename '/path/to/tftp/location/kernel_fdt.itb'. Load address: 0x900000 Loading: ################################################################# - ########### + ########### done Bytes transferred = 1109776 (10ef10 hex) => iminfo @@ -220,15 +220,15 @@ Bytes transferred = 1109776 (10ef10 hex) ## Checking Image at 00900000 ... FIT image found FIT description: Simple image with single Linux kernel and FDT blob - Created: 2008-03-11 15:29:22 UTC + Created: 2008-03-11 15:29:22 UTC Image 0 (kernel@1) Description: Vanilla Linux kernel - Type: Kernel Image + Type: Kernel Image Compression: gzip compressed Data Start: 0x009000ec Data Size: 1092037 Bytes = 1 MB Architecture: PowerPC - OS: Linux + OS: Linux Load Address: 0x00000000 Entry Point: 0x00000000 Hash algo: crc32 @@ -237,7 +237,7 @@ Bytes transferred = 1109776 (10ef10 hex) Hash value: 264b59935470e42c418744f83935d44cdf59a3bb Image 1 (fdt@1) Description: Flattened Device Tree blob - Type: Flat Device Tree + Type: Flat Device Tree Compression: uncompressed Data Start: 0x00a0abdc Data Size: 16384 Bytes = 16 kB @@ -249,19 +249,19 @@ Bytes transferred = 1109776 (10ef10 hex) Default Configuration: 'conf@1' Configuration 0 (conf@1) Description: Boot Linux kernel with FDT blob - Kernel: kernel@1 - FDT: fdt@1 + Kernel: kernel@1 + FDT: fdt@1 => bootm ## Booting kernel from FIT Image at 00900000 ... Using 'conf@1' configuration Trying 'kernel@1' kernel subimage Description: Vanilla Linux kernel - Type: Kernel Image + Type: Kernel Image Compression: gzip compressed Data Start: 0x009000ec Data Size: 1092037 Bytes = 1 MB Architecture: PowerPC - OS: Linux + OS: Linux Load Address: 0x00000000 Entry Point: 0x00000000 Hash algo: crc32 @@ -274,7 +274,7 @@ Bytes transferred = 1109776 (10ef10 hex) Using 'conf@1' configuration Trying 'fdt@1' FDT blob subimage Description: Flattened Device Tree blob - Type: Flat Device Tree + Type: Flat Device Tree Compression: uncompressed Data Start: 0x00a0abdc Data Size: 16384 Bytes = 16 kB diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index 1d7545811b..c1244fbada 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -68,11 +68,11 @@ actual binary of a new uImage. tqm5200.its + -vmlinux.bin.gz mkimage + dtc xfer to target +vmlinux.bin.gz mkimage + dtc xfer to target eldk-4.2-ramdisk --------------> tqm5200.itb --------------> bootm -tqm5200.dtb /|\ -... | - 'new uImage' +tqm5200.dtb /|\ +... | + 'new uImage' - create .its file, automatically filled-in properties are omitted - call mkimage tool on a .its file -- cgit v1.2.3