Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / arch / blackfin / lib / boot.c

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;