diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-26 11:48:46 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-26 11:48:46 +0100 |
| commit | 438a4c11260b4ea9805039b0b4f92f9df5306b02 (patch) | |
| tree | 129249d52bde5db280441f76f4141a9214f558d0 /doc/uImage.FIT/command_syntax_extensions.txt | |
| parent | b951f8d31711f3f10ad119ddcf5a3d0afe14d561 (diff) | |
| download | u-boot-imx-438a4c11260b4ea9805039b0b4f92f9df5306b02.zip u-boot-imx-438a4c11260b4ea9805039b0b4f92f9df5306b02.tar.gz u-boot-imx-438a4c11260b4ea9805039b0b4f92f9df5306b02.tar.bz2 | |
Cleanup coding style, update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'doc/uImage.FIT/command_syntax_extensions.txt')
| -rw-r--r-- | doc/uImage.FIT/command_syntax_extensions.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/doc/uImage.FIT/command_syntax_extensions.txt b/doc/uImage.FIT/command_syntax_extensions.txt index b8b50ff..6185cd8 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 <addr1> /* single image at <addr1> */ -3. bootm <addr1> /* multi-image at <addr1> */ -4. bootm <addr1> - /* multi-image at <addr1> */ -5. bootm <addr1> <addr2> /* single image at <addr1> */ +2. bootm <addr1> /* single image at <addr1> */ +3. bootm <addr1> /* multi-image at <addr1> */ +4. bootm <addr1> - /* multi-image at <addr1> */ +5. bootm <addr1> <addr2> /* single image at <addr1> */ 6. bootm <addr1> <addr2> <addr3> /* single image at <addr1> */ -7. bootm <addr1> - <addr3> /* single image at <addr1> */ +7. bootm <addr1> - <addr3> /* single image at <addr1> */ New uImage: 8. bootm <addr1> @@ -40,8 +40,8 @@ New uImage: 11. bootm [<addr1>]:<subimg1> [<addr2>]:<subimg2> 12. bootm [<addr1>]:<subimg1> [<addr2>]:<subimg2> [<addr3>]:<subimg3> 13. bootm [<addr1>]:<subimg1> [<addr2>]:<subimg2> <addr3> -14. bootm [<addr1>]:<subimg1> - [<addr3>]:<subimg3> -15. bootm [<addr1>]:<subimg1> - <addr3> +14. bootm [<addr1>]:<subimg1> - [<addr3>]:<subimg3> +15. bootm [<addr1>]:<subimg1> - <addr3> 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 <addr1>, 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). |