diff options
| author | Simon Glass <sjg@chromium.org> | 2013-07-11 06:08:09 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-12 14:32:39 (GMT) |
| commit | 7af26b1669b75a02e1cfaa68ac526897e790af84 (patch) | |
| tree | 8f712f6ac5e9fee0aebe6412a0cc80f5aecd71c8 /arch | |
| parent | ec3902919307f1e1defbefa177a9298f0ddb7e53 (diff) | |
| download | u-boot-fsl-qoriq-7af26b1669b75a02e1cfaa68ac526897e790af84.tar.xz | |
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')
| -rw-r--r-- | arch/blackfin/lib/boot.c | 2 | ||||
| -rw-r--r-- | arch/x86/lib/bootm.c | 2 |
2 files changed, 4 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; diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 0d3250c..b84e35a 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -48,6 +48,8 @@ int do_bootm_linux(int flag, int argc, char * const argv[], size_t len; #endif + if (flag & BOOTM_STATE_OS_PREP) + return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; |