mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Holger Schurig <holgerschurig@gmail.com>
To: barebox@lists.infradead.org
Subject: [PATCH 08/10] bootm: beautify output
Date: Fri, 30 May 2014 11:07:34 +0200	[thread overview]
Message-ID: <1401440856-6145-9-git-send-email-holgerschurig@gmail.com> (raw)
In-Reply-To: <1401440856-6145-1-git-send-email-holgerschurig@gmail.com>

* 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>
---
 arch/arm/lib/armlinux.c |    2 +-
 commands/Kconfig        |   15 ++++++++++-----
 commands/bootm.c        |   15 ++++++++-------
 common/bootm.c          |    4 ++--
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index bc28620..16879f8 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -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);
diff --git a/commands/Kconfig b/commands/Kconfig
index a1b1fc8..eed6fbd 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 5801f44..d6625df 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
diff --git a/common/bootm.c b/common/bootm.c
index d6e02a7..871959c 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -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");
 		}
 	}
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2014-05-30  9:02 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-30  9:07 [PATCH 00/10] miscelleanous beautification patches Holger Schurig
2014-05-30  9:05 ` Holger Schurig
2014-05-30  9:07 ` [PATCH 01/10] drvlist: factor the driver list out of 'devinfo' Holger Schurig
2014-05-30  9:09   ` Holger Schurig
2014-05-30  9:07 ` [PATCH 02/10] devinfo: reduce indentation Holger Schurig
2014-05-30  9:08   ` Holger Schurig
2014-05-30  9:49     ` Antony Pavlov
2014-05-30  9:07 ` [PATCH 03/10] devinfo: make the output of "devinfo DEVICE" nicer Holger Schurig
2014-05-30  9:07   ` Holger Schurig
2014-06-02  8:19     ` Juergen Borleis
2014-06-02  9:23       ` Holger Schurig
2014-06-02 10:09         ` Juergen Borleis
2014-06-02 10:28           ` Holger Schurig
2014-05-30  9:07 ` [PATCH 04/10] parameters: only show possible enumerations if there are any Holger Schurig
2014-05-30  9:09   ` Holger Schurig
2014-05-30  9:07 ` [PATCH 05/10] net: show enetaddr in lowercase Holger Schurig
2014-05-30  9:07 ` [PATCH 06/10] meminfo: purely cosmetical changes Holger Schurig
2014-05-30  9:43   ` Antony Pavlov
2014-05-30  9:37     ` Holger Schurig
2014-05-30  9:07 ` [PATCH 07/10] misc: upper-case some abbreviations Holger Schurig
2014-05-30  9:07 ` Holger Schurig [this message]
2014-05-30  9:06   ` [PATCH 08/10] bootm: beautify output Holger Schurig
2014-05-30  9:07 ` [PATCH 09/10] beautify PHY driver names Holger Schurig
2014-05-30  9:17   ` Alexander Aring
2014-05-30  9:30     ` Holger Schurig
2014-05-30 10:03       ` Alexander Aring
2014-06-02  6:59   ` Sascha Hauer
2014-05-30  9:07 ` [PATCH 10/10] device drivers: harmonize underscore in " Holger Schurig
2014-06-02  7:16   ` Sascha Hauer
2014-06-02  7:21 ` [PATCH 00/10] miscelleanous beautification patches Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401440856-6145-9-git-send-email-holgerschurig@gmail.com \
    --to=holgerschurig@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox