From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sughosh Ganu Date: Fri, 12 Jul 2013 13:58:05 +0530 Subject: [U-Boot] [PATCH 2/4] blackfin: x86: bootm: Handle PREP stage of bootm In-Reply-To: <1373522891-7677-3-git-send-email-sjg@chromium.org> References: <1373522891-7677-1-git-send-email-sjg@chromium.org> <1373522891-7677-3-git-send-email-sjg@chromium.org> Message-ID: <20130712082805.GB3047@Hardy> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wed Jul 10, 2013 at 11:08:09PM -0700, Simon Glass wrote: > The OS function is now always called with the PREP stage. Adjust the > remaining bootm OS functions to deal with this correctly. > > Signed-off-by: Simon Glass > --- > arch/blackfin/lib/boot.c | 2 ++ > arch/x86/lib/bootm.c | 2 ++ > common/cmd_bootm.c | 16 ++++++++++++++++ > 3 files changed, 20 insertions(+) > > diff --git a/arch/blackfin/lib/boot.c b/arch/blackfin/lib/boot.c > index 768a882..5644d58 100644 > --- a/arch/blackfin/lib/boot.c > +++ b/arch/blackfin/lib/boot.c > @@ -42,6 +42,8 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima > int (*appl) (char *cmdline); > char *cmdline; > > + if (flag & BOOTM_STATE_OS_PREP) > + return 0; > if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) > return 1; Minor nit; A blank line between the two if conditions would be good. Applies for all the hunks in this patch. -sughosh