From: Tom Rini Date: Fri, 8 Nov 2013 17:30:18 -0500 Subject: [U-Boot] [U-Boot, v2] common/cmd_bootm.c: fix subcommand processing in OS specific do_bootm_xxx() functions In-Reply-To: <1383535094-2940-1-git-send-email-miao.yan@windriver.com> References: <1383535094-2940-1-git-send-email-miao.yan@windriver.com> Message-ID: <20131108223018.GH5925@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Mon, Nov 04, 2013 at 11:18:14AM +0800, miao.yan at windriver.com wrote: > From: Miao Yan > > In commit "5c427e4: use BOOTM_STATE_OS_CMDLINE flag for plain bootm" > and "3d187b3: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS", > BOOTM_STATE_OS_CMDLINE was added to do_bootm for PowerPC and MIPS. This > breaks other OSes (vxworks, netbsd, plan9,...) that don't support > subcommand processing, e.g. they all contain the following code in their > do_bootm_xxx(): > > if (flag & BOOTM_STATE_OS_PREP) > return 0; > if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) > return 1; > > which will result a "subcommand not supported" error. > This patch changes the above logic to: > > /* if not go command, pretend everything to be OK */ > if (flag != BOOTM_STATE_OS_GO) > return 0; > > Signed-off-by: Miao Yan Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: