summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-11-18 19:08:59 -0600
committerWolfgang Denk <wd@denx.de>2009-12-07 22:12:49 +0100
commit224c90d1060bf1a83cbf33ca51d060b9d19e0294 (patch)
tree1514777665a023faa2f241cb21e1fdaef48d7623 /common
parenta93c92cddaedd5f0720e0da15c6664f7a688b582 (diff)
downloadu-boot-imx-224c90d1060bf1a83cbf33ca51d060b9d19e0294.zip
u-boot-imx-224c90d1060bf1a83cbf33ca51d060b9d19e0294.tar.gz
u-boot-imx-224c90d1060bf1a83cbf33ca51d060b9d19e0294.tar.bz2
bootm: Fix help message's sub-command ordering
The help message for the 'bootm' command listed the 'cmdline' and 'bdt' sub-commands in the wrong order which resulted in the error below when following the 'help' command's instructions: "Trying to execute a command out of order" Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 401bf27..e16552e 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -453,8 +453,8 @@ cmd_tbl_t cmd_bootm_sub[] = {
#ifdef CONFIG_OF_LIBFDT
U_BOOT_CMD_MKENT(fdt, 0, 1, (void *)BOOTM_STATE_FDT, "", ""),
#endif
- U_BOOT_CMD_MKENT(bdt, 0, 1, (void *)BOOTM_STATE_OS_BD_T, "", ""),
U_BOOT_CMD_MKENT(cmdline, 0, 1, (void *)BOOTM_STATE_OS_CMDLINE, "", ""),
+ U_BOOT_CMD_MKENT(bdt, 0, 1, (void *)BOOTM_STATE_OS_BD_T, "", ""),
U_BOOT_CMD_MKENT(prep, 0, 1, (void *)BOOTM_STATE_OS_PREP, "", ""),
U_BOOT_CMD_MKENT(go, 0, 1, (void *)BOOTM_STATE_OS_GO, "", ""),
};
@@ -1000,8 +1000,8 @@ U_BOOT_CMD(
#if defined(CONFIG_OF_LIBFDT)
"\tfdt - relocate flat device tree\n"
#endif
- "\tbdt - OS specific bd_t processing\n"
"\tcmdline - OS specific command line processing/setup\n"
+ "\tbdt - OS specific bd_t processing\n"
"\tprep - OS specific prep before relocation or go\n"
"\tgo - start OS"
);