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>

diff --git a/arch/blackfin/lib/boot.c b/arch/blackfin/lib/boot.c
index 768a8826b55c1ac94814f9a56b7033efddf9bd9d..5644d589e7609c0bea09239f89692ca15a391b57 100644 (file)
--- 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 0d3250cfa304da27c10dfb12694c9331b1f11d52..b84e35a9b809e10401c3307ce51b7739f94030e6 100644 (file)
--- 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;
 

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 72d8837cd55755bf8f0c2db54374c12c1100c5a4..9985531452cdde79211f87f34cef999d471b4313 100644 (file)
--- 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;