doc: add README for CONFIG_HWCONFIG option

[karo-tx-uboot.git] / lib_mips / bootm.c

diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index dced28c7c147aa4fc2d5c81a013623c8298749c5..54af24cba3f7cd8af0ed843e72a2399ae07e0ce2 100644 (file)
--- a/lib_mips/bootm.c
+++ b/lib_mips/bootm.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/addrspace.h>
 
@@ -50,6 +50,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
        char    env_buf[12];
        char    *cp;
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
        /* find kernel entry point */
        theKernel = (void (*)(int, char **, char **, int *))images->ep;