sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Holger Schurig 2014-05-30 11:07:34 +02:00 committed by Sascha Hauer
parent bfd5d7f112
commit 93ba05b5fd
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/lib/armlinux.c
View File

@ -261,7 +261,7 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
int architecture;
if (oftree) {
printf("booting kernel with devicetree\n");
pr_debug("booting kernel with devicetree\n");
params = oftree;
} else {
setup_tags(initrd_address, initrd_size, swap);

15
commands/Kconfig
View File

@ -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

15
commands/bootm.c
View File

@ -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

4
common/bootm.c
View File

@ -428,7 +428,7 @@ int bootm_boot(struct bootm_data *bootm_data)
}
}
printf("\nLoading OS %s '%s'", file_type_to_string(os_type),
printf("\nLoading %s '%s'", file_type_to_string(os_type),
data->os_file);
if (os_type == filetype_uimage &&
data->os->header.ih_type == IH_TYPE_MULTI)
@ -442,7 +442,7 @@ int bootm_boot(struct bootm_data *bootm_data)
goto err_out;
} else {
data->of_root_node = of_get_root_node();
if (data->of_root_node)
if (bootm_verbose(data) > 1 && data->of_root_node)
printf("using internal devicetree\n");
}
}