mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] bootm.c: "-o" option should refer to "DTB", not "DTS"
@ 2014-07-04 12:02 Robert P. J. Day
  2014-07-07  6:30 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Robert P. J. Day @ 2014-07-04 12:02 UTC (permalink / raw)
  To: U-Boot Version 2 (barebox)


Fix option explanation, and a couple grammar fixes.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

  unless i misread this, the bootm "-o" option should take a DTB
argument, not a DTS, yes? and since i was there, a couple trivial
grammar fixes.

diff --git a/commands/bootm.c b/commands/bootm.c
index 617acd6..a65864a 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -143,7 +143,7 @@ err_out:
 BAREBOX_CMD_HELP_START(bootm)
 BAREBOX_CMD_HELP_TEXT("Options:")
 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 ("-d\t",  "dry run: 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")
@@ -152,7 +152,7 @@ BAREBOX_CMD_HELP_OPT ("-L ADDR\t","specify initrd load address")
 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\t","specify open firmware device tree")
+BAREBOX_CMD_HELP_OPT ("-o DTB\t","specify open firmware device tree")
 #endif
 #ifdef CONFIG_CMD_BOOTM_VERBOSE
 BAREBOX_CMD_HELP_OPT ("-v\t","verbose")
@@ -178,7 +178,7 @@ BAREBOX_CMD_START(bootm)
 	BAREBOX_CMD_HELP(cmd_bootm_help)
 BAREBOX_CMD_END

-BAREBOX_MAGICVAR(bootargs, "Linux Kernel parameters");
+BAREBOX_MAGICVAR(bootargs, "Linux kernel parameters");
 BAREBOX_MAGICVAR_NAMED(global_bootm_image, global.bootm.image, "bootm default boot image");
 BAREBOX_MAGICVAR_NAMED(global_bootm_image_loadaddr, global.bootm.image.loadaddr, "bootm default boot image loadaddr");
 BAREBOX_MAGICVAR_NAMED(global_bootm_initrd, global.bootm.initrd, "bootm default initrd");

-- 

========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                        http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] bootm.c: "-o" option should refer to "DTB", not "DTS"
  2014-07-04 12:02 [PATCH] bootm.c: "-o" option should refer to "DTB", not "DTS" Robert P. J. Day
@ 2014-07-07  6:30 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2014-07-07  6:30 UTC (permalink / raw)
  To: Robert P. J. Day; +Cc: U-Boot Version 2 (barebox)

On Fri, Jul 04, 2014 at 08:02:02AM -0400, Robert P. J. Day wrote:
> 
> Fix option explanation, and a couple grammar fixes.
> 
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
> 
> ---
> 
>   unless i misread this, the bootm "-o" option should take a DTB
> argument, not a DTS, yes? and since i was there, a couple trivial
> grammar fixes.

Yes, bootm doesn't take DTS files, it always needs a dtb.

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-07-07  6:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-04 12:02 [PATCH] bootm.c: "-o" option should refer to "DTB", not "DTS" Robert P. J. Day
2014-07-07  6:30 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox