summaryrefslogtreecommitdiff
path: root/arch/blackfin
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-07-10 23:08:09 -0700
committerTom Rini <trini@ti.com>2013-07-12 10:32:39 -0400
commit7af26b1669b75a02e1cfaa68ac526897e790af84 (patch)
tree8f712f6ac5e9fee0aebe6412a0cc80f5aecd71c8 /arch/blackfin
parentec3902919307f1e1defbefa177a9298f0ddb7e53 (diff)
downloadu-boot-imx-7af26b1669b75a02e1cfaa68ac526897e790af84.zip
u-boot-imx-7af26b1669b75a02e1cfaa68ac526897e790af84.tar.gz
u-boot-imx-7af26b1669b75a02e1cfaa68ac526897e790af84.tar.bz2
blackfin: x86: bootm: Handle PREP stage of bootm
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 <sjg@chromium.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/lib/boot.c2
1 files changed, 2 insertions, 0 deletions
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;