diff mbox

[U-Boot] cmd_bootm.c: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS

Message ID 1379961214-11640-1-git-send-email-trini@ti.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Tom Rini Sept. 23, 2013, 6:33 p.m. UTC 
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>
---
 common/cmd_bootm.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Tom Rini Sept. 24, 2013, 3:02 p.m. UTC | #1 
On Mon, Sep 23, 2013 at 02:33:33PM -0400, Tom Rini wrote:
> 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

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);
 }