Blackfin: make default ADI env more flexible

[u-boot] / lib_arm / bootm.c

diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 8e264ceb2fc52d688b3cd6f198d3ee30f1948578..128b7e313cdfa6a11719716726dc6956ad5dd43b 100644 (file)
--- a/lib_arm/bootm.c
+++ b/lib_arm/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>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -67,7 +67,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
        char *commandline = getenv ("bootargs");
 #endif
 
-       if ((flag != 0) || (flag != BOOTM_STATE_OS_GO))
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
                return 1;
 
        theKernel = (void (*)(int, int, uint))images->ep;