summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-09-23 14:20:37 -0400
committerTom Rini <trini@ti.com>2013-09-23 14:20:37 -0400
commit3d187b3924b5c027b3e591c439838bc1c70afefd (patch)
treefc8edb1b4d83484ed295155456309e1a21960d31 /common
parentd0b961684eb5757211e9463f5f24c3175e453798 (diff)
downloadu-boot-imx-3d187b3924b5c027b3e591c439838bc1c70afefd.zip
u-boot-imx-3d187b3924b5c027b3e591c439838bc1c70afefd.tar.gz
u-boot-imx-3d187b3924b5c027b3e591c439838bc1c70afefd.tar.bz2
cmd_bootm.c: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS
In 5c427e4 we pass BOOTM_STATE_OS_CMDLINE as part of the bootm states to run, on all arches. However, this is only valid / useful on PowerPC and MIPS, and causes a problem on ARM where we specifically do not use it. Rather than make this state fake pass like we do for GO on some arches (which need updating to use the GO state), we should just not pass CMDLINE except when it may be used, like before. Tested-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 349f165..166b901 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -800,7 +800,10 @@ int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START |
BOOTM_STATE_FINDOS | BOOTM_STATE_FINDOTHER |
- BOOTM_STATE_LOADOS | BOOTM_STATE_OS_CMDLINE |
+ BOOTM_STATE_LOADOS |
+#if defined(CONFIG_PPC) || defined(CONFIG_MIPS)
+ BOOTM_STATE_OS_CMDLINE |
+#endif
BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
BOOTM_STATE_OS_GO, &images, 1);
}