diff options
author | Holger Schurig <holgerschurig@gmail.com> | 2014-05-30 11:07:34 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-02 09:07:12 +0200 |
commit | 93ba05b5fded2817d6e19a82be5871cf6d2238c2 (patch) | |
tree | 155392dde1df1456fbe7739f6b2df8c64678fab4 /commands | |
parent | bfd5d7f11298ddff7f8c0ce47840d847fa19064a (diff) | |
download | barebox-93ba05b5fded2817d6e19a82be5871cf6d2238c2.tar.gz barebox-93ba05b5fded2817d6e19a82be5871cf6d2238c2.tar.xz |
bootm: beautify output
* fix indentation of options in 'help bootm'
* add missing help for -m
* put some output into debug/verbose mode
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
-rw-r--r-- | commands/Kconfig | 15 | ||||
-rw-r--r-- | commands/bootm.c | 15 |
2 files changed, 18 insertions, 12 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index a1b1fc8461..eed6fbdd3c 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -288,11 +288,16 @@ config CMD_BOOT one succeeds. Options: - -v Increase verbosity - -d Dryrun. See what happens but do no actually boot - -l List available boot sources - -m Show a menu with boot options - -t SECS specify timeout in SECS + -c crc check uImage data + -d dryrun: check data, but do not run + -f load images even if type is undetectable + -r INITRD specify an initrd image + -L ADDR specify initrd load address + -a ADDR specify os load address + -e OFFS entry point to the image relative to start (0) + -o DTS specify open firmware device tree + -v verbose + config CMD_BOOTM tristate diff --git a/commands/bootm.c b/commands/bootm.c index 5801f4422c..d6625df460 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -142,16 +142,17 @@ err_out: BAREBOX_CMD_HELP_START(bootm) BAREBOX_CMD_HELP_TEXT("Options:") -BAREBOX_CMD_HELP_OPT ("-c", "crc check uImage data") -BAREBOX_CMD_HELP_OPT ("-d", "dryrun. Check data, but do not run") +BAREBOX_CMD_HELP_OPT ("-c\t", "crc check uImage data") +BAREBOX_CMD_HELP_OPT ("-d\t", "dryrun: check data, but do not run") +BAREBOX_CMD_HELP_OPT ("-f\t", "load images even if type is undetectable") #ifdef CONFIG_CMD_BOOTM_INITRD BAREBOX_CMD_HELP_OPT ("-r INITRD","specify an initrd image") -BAREBOX_CMD_HELP_OPT ("-L ADDR","specify initrd load address") +BAREBOX_CMD_HELP_OPT ("-L ADDR\t","specify initrd load address") #endif -BAREBOX_CMD_HELP_OPT ("-a ADDR","specify os load address") -BAREBOX_CMD_HELP_OPT ("-e OFFS","entry point to the image relative to start (0)") +BAREBOX_CMD_HELP_OPT ("-a ADDR\t","specify os load address") +BAREBOX_CMD_HELP_OPT ("-e OFFS\t","entry point to the image relative to start (0)") #ifdef CONFIG_OFTREE -BAREBOX_CMD_HELP_OPT ("-o DTS","specify device tree") +BAREBOX_CMD_HELP_OPT ("-o DTS\t","specify open firmware device tree") #endif #ifdef CONFIG_CMD_BOOTM_VERBOSE BAREBOX_CMD_HELP_OPT ("-v\t","verbose") @@ -161,7 +162,7 @@ BAREBOX_CMD_HELP_END BAREBOX_CMD_START(bootm) .cmd = do_bootm, BAREBOX_CMD_DESC("boot an application image") - BAREBOX_CMD_OPTS("[-cd" + BAREBOX_CMD_OPTS("[-cdf" #ifdef CONFIG_CMD_BOOTM_INITRD "rL" #endif |