Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[platform/kernel/u-boot.git] / lib_microblaze / bootm.c

diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c
index 52fe068..bce4774 100644 (file)
--- a/lib_microblaze/bootm.c
+++ b/lib_microblaze/bootm.c
@@ -27,7 +27,7 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -38,6 +38,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
        void    (*theKernel) (char *);
        char    *commandline = getenv ("bootargs");
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
        theKernel = (void (*)(char *))images->ep;
 
        show_boot_progress (15);