sh3/sh4: rename config option TMU_CLK_DIVIDER to CONFIG_SYS_TMU_CLK_DIV

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

diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c
index e3d49855a86b2425e246de0cbd4ddd5c18650d98..ae1f869f10d9b31da0e69a4ab75797a955045276 100644 (file)
--- a/lib_sh/bootm.c
+++ b/lib_sh/bootm.c
@@ -28,7 +28,7 @@
 #include <command.h>
 #include <asm/byteorder.h>
 
-#ifdef CFG_DEBUG
+#ifdef CONFIG_SYS_DEBUG
 static void hexdump(unsigned char *buf, int len)
 {
        int i;
@@ -56,6 +56,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
        unsigned long size = images->ep - (unsigned long)param;
        char *bootargs = getenv("bootargs");
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
        /* Setup parameters */
        memset(param, 0, size); /* Clear zero page */
        strcpy(cmdline, bootargs);