diff options
| author | Simon Glass <sjg@chromium.org> | 2013-07-10 23:08:09 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-12 10:32:39 -0400 |
| commit | 7af26b1669b75a02e1cfaa68ac526897e790af84 (patch) | |
| tree | 8f712f6ac5e9fee0aebe6412a0cc80f5aecd71c8 /common | |
| parent | ec3902919307f1e1defbefa177a9298f0ddb7e53 (diff) | |
| download | u-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 'common')
| -rw-r--r-- | common/cmd_bootm.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 72d8837..9985531 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1472,6 +1472,8 @@ static int do_bootm_netbsd(int flag, int argc, char * const argv[], char *consdev; char *cmdline; + if (flag & BOOTM_STATE_OS_PREP) + return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; @@ -1551,6 +1553,8 @@ static int do_bootm_lynxkdi(int flag, int argc, char * const argv[], { image_header_t *hdr = &images->legacy_hdr_os_copy; + if (flag & BOOTM_STATE_OS_PREP) + return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; @@ -1573,6 +1577,8 @@ static int do_bootm_rtems(int flag, int argc, char * const argv[], { void (*entry_point)(bd_t *); + if (flag & BOOTM_STATE_OS_PREP) + return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; @@ -1606,6 +1612,8 @@ static int do_bootm_ose(int flag, int argc, char * const argv[], { void (*entry_point)(void); + if (flag & BOOTM_STATE_OS_PREP) + return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; @@ -1640,6 +1648,8 @@ static int do_bootm_plan9(int flag, int argc, char * const argv[], void (*entry_point)(void); char *s; + if (flag & BOOTM_STATE_OS_PREP) + return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; @@ -1687,6 +1697,8 @@ static int do_bootm_vxworks(int flag, int argc, char * const argv[], { char str[80]; + if (flag & BOOTM_STATE_OS_PREP) + return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; @@ -1710,6 +1722,8 @@ static int do_bootm_qnxelf(int flag, int argc, char * const argv[], char *local_args[2]; char str[16]; + if (flag & BOOTM_STATE_OS_PREP) + return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; @@ -1735,6 +1749,8 @@ static int do_bootm_integrity(int flag, int argc, char * const argv[], { void (*entry_point)(void); + if (flag & BOOTM_STATE_OS_PREP) + return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; |