avr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux

[karo-tx-uboot.git] / arch / sh / lib / bootm.c

diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c
index f38d0b0e8e3fbc4e9276ff24cd212a2ea43b0a76..4fdc7aab74577e3dadd68473b4cbf2e0bb1b26e6 100644 (file)
--- a/arch/sh/lib/bootm.c
+++ b/arch/sh/lib/bootm.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/byteorder.h>
+#include <asm/zimage.h>
 
 #ifdef CONFIG_SYS_DEBUG
 static void hexdump(unsigned char *buf, int len)
@@ -43,19 +44,6 @@ static void hexdump(unsigned char *buf, int len)
 }
 #endif
 
-#define MOUNT_ROOT_RDONLY      0x000
-#define RAMDISK_FLAGS          0x004
-#define ORIG_ROOT_DEV          0x008
-#define LOADER_TYPE                    0x00c
-#define INITRD_START           0x010
-#define INITRD_SIZE                    0x014
-#define COMMAND_LINE           0x100
-
-#define RD_PROMPT      (1<<15)
-#define RD_DOLOAD      (1<<14)
-#define CMD_ARG_RD_PROMPT      "prompt_ramdisk="
-#define CMD_ARG_RD_DOLOAD      "load_ramdisk="
-
 #ifdef CONFIG_SH_SDRAM_OFFSET
 #define GET_INITRD_START(initrd, linux) (initrd - linux + CONFIG_SH_SDRAM_OFFSET)
 #else
@@ -91,16 +79,21 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
        unsigned long size = images->ep - (unsigned long)param;
        char *bootargs = getenv("bootargs");
 
+       /*
+        * allow the PREP bootm subcommand, it is required for bootm to work
+        */
+       if (flag & BOOTM_STATE_OS_PREP)
+               return 0;
+
        if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
                return 1;
 
-       /* Setup parameters */
-       memset(param, 0, size); /* Clear zero page */
+       /* Clear zero page */
+       memset(param, 0, size);
 
        /* Set commandline */
        strcpy(cmdline, bootargs);
 
-       sh_check_cmd_arg(bootargs, CMD_ARG_RD_DOLOAD, 10);
        /* Initrd */
        if (images->rd_start || images->rd_end) {
                unsigned long ramdisk_flags = 0;
@@ -109,7 +102,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
                                ramdisk_flags |= RD_PROMPT;
                else
                                ramdisk_flags &= ~RD_PROMPT;
-                                       
+
                val = sh_check_cmd_arg(bootargs, CMD_ARG_RD_DOLOAD, 10);
                if (val == 1)
                                ramdisk_flags |= RD_DOLOAD;
@@ -128,7 +121,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
 
        /* Boot kernel */
        kernel();
-       /* does not return */
 
+       /* does not return */
        return 1;
 }