diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-17 16:33:57 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-17 16:33:57 +0100 |
| commit | 146a7fe4a2427d4aaece1d1a642c52a50c95691f (patch) | |
| tree | 610db5431aeffbda14d1f37381995a7322ce21aa /commands/Kconfig | |
| parent | 84fd8a956cda82b54c85d8047c6f7ed7ec6879c5 (diff) | |
| parent | 52fac4b1ff5da3deff3e9f0cae681ff23337c1f1 (diff) | |
| download | barebox-146a7fe4a2427d4aaece1d1a642c52a50c95691f.tar.gz barebox-146a7fe4a2427d4aaece1d1a642c52a50c95691f.tar.xz | |
Merge branch 'work/uimage' into next
Conflicts:
arch/ppc/lib/ppclinux.c
commands/bootm.c
include/boot.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/Kconfig')
| -rw-r--r-- | commands/Kconfig | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index ebc9c7f2d0..3e9f06fce5 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -310,11 +310,40 @@ config CMD_BOOTM_SHOW_TYPE depends on CMD_BOOTM prompt "show image information" -config CMD_IMINFO +config CMD_BOOTM_VERBOSE bool - prompt "iminfo" + prompt "bootm verbose support" + depends on CMD_BOOTM + help + support verbose bootm (-v switch) + +config CMD_BOOTM_INITRD + bool + prompt "bootm initrd support" + depends on CMD_BOOTM + help + support initrds in bootm + +config CMD_BOOTM_OFTREE + bool + select OFTREE + prompt "bootm oftree support" + help + say yes here to support passing a flat device tree to the kernel + +config CMD_BOOTM_OFTREE_UIMAGE + bool + prompt "support passing oftree uImages" + depends on CMD_BOOTM_OFTREE + help + Support using oftree uImages. Without this only raw oftree + blobs can be used. + +config CMD_UIMAGE + tristate + prompt "uimage" help - Show information about uImages + Show information about uImage and also extract and verify uImages. config CMD_BOOTZ tristate |