From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Tue, 2 Jul 2013 09:03:34 -0400 Subject: [U-Boot] [PATCH] avr32: fix do_bootm_linux In-Reply-To: <1372766264-15691-1-git-send-email-andreas.devel@googlemail.com> References: <1372766264-15691-1-git-send-email-andreas.devel@googlemail.com> Message-ID: <20130702130334.GD16630@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 Tue, Jul 02, 2013 at 01:57:44PM +0200, Andreas Bie??mann wrote: > Commit 35fc84fa1ff51e15ecd3e464dac87eb105ffed30 broke bootm on avr32. It > requires to call do_bootm_linux() with flag set to BOOTM_STATE_OS_PREP before > calling it again with flag set to BOOTM_STATE_OS_GO. > Fix this by allowing flag set to BOOTM_STATE_OS_PREP, this however will > require a complete refactoring later on. > > Signed-off-by: Andreas Bie??mann > > --- > arch/avr32/lib/bootm.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/arch/avr32/lib/bootm.c b/arch/avr32/lib/bootm.c > index 87f3f9c..eedab9d 100644 > --- a/arch/avr32/lib/bootm.c > +++ b/arch/avr32/lib/bootm.c > @@ -187,6 +187,15 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima > struct tag *params, *params_start; > char *commandline = getenv("bootargs"); > > + /* > + * allow the PREP bootm subcommand, it is required for bootm to work > + * > + * TODO: Andreas Bie??mann refactor the > + * do_bootm_linux() for avr32 > + */ > + if (flag & BOOTM_STATE_OS_PREP) > + return 0; > + > if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) > return 1; Good catch! I'm going to make a v2 of this patch that fixes all of the other arches that're missing this hunk. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: