cmd_bootm.c: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS
PATCH 1/1 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.
--- common/cmd_bootm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
common/cmd_bootm.c +4 -1
@@ -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 | +#endifBOOTM_STATE_OS_PREP |BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO, &images, 1); }
Signature · 1 line
1.7.9.5
PATCH 1/1 cmd_bootm.c: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS
Quoted 9 lines · Tom Rini
In 5c427e4 we pass
BOOTM_STATE_OS_CMDLINEas 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 <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130924/7650da9a/attachment.pgp>