sh: Add support any page size and empty_zero_page to SH Linux uImage

Old U-Boot supported 4KB page size only. If this version, Linux
kernel can not get command line from U-Boot.
SH Linux kernel can change page size and empty_zero_page.
This patch support this function and fix promlem.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c
index bc1c3da9e23a98f83bedd52bb8acec3d18f36d82..d5056ae98a7da23eb2c69a88c5d792f1142c6bfe 100644 (file)
--- a/lib_sh/bootm.c
+++ b/lib_sh/bootm.c
@@ -2,6 +2,9 @@
  * (C) Copyright 2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
+ * (c) Copyright 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
+ * (c) Copyright 2008 Renesas Solutions Corp.
+ *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
@@ -25,47 +28,36 @@
 #include <command.h>
 #include <asm/byteorder.h>
 
-/* The SH kernel reads arguments from the empty zero page at location
- * 0 at the start of SDRAM. The following are copied from
- * arch/sh/kernel/setup.c and may require tweaking if the kernel sources
- * change.
- */
-#define PARAM  ((unsigned char *)CFG_SDRAM_BASE + 0x1000)
-
-#define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000))
-#define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004))
-#define ORIG_ROOT_DEV (*(unsigned long *) (PARAM+0x008))
-#define LOADER_TYPE (*(unsigned long *) (PARAM+0x00c))
-#define INITRD_START (*(unsigned long *) (PARAM+0x010))
-#define INITRD_SIZE (*(unsigned long *) (PARAM+0x014))
-/* ... */
-#define COMMAND_LINE ((char *) (PARAM+0x100))
-
-#define RAMDISK_IMAGE_START_MASK       0x07FF
-
 #ifdef CFG_DEBUG
-static void hexdump (unsigned char *buf, int len)
+static void hexdump(unsigned char *buf, int len)
 {
        int i;
 
        for (i = 0; i < len; i++) {
                if ((i % 16) == 0)
-                       printf ("%s%08x: ", i ? "\n" : "", (unsigned int) &buf[i]);
-               printf ("%02x ", buf[i]);
+                       printf("%s%08x: ", i ? "\n" : "",
+                                                       (unsigned int)&buf[i]);
+               printf("%02x ", buf[i]);
        }
-       printf ("\n");
+       printf("\n");
 }
 #endif
 
 int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
-       char    *bootargs = getenv("bootargs");
-
+       /* Linux kernel load address */
        void (*kernel) (void) = (void (*)(void))images->ep;
+       /* empty_zero_page */
+       unsigned char *param = (unsigned char *)image_get_ep(images);
+       /* Linux kernel command line */
+       unsigned char *cmdline = param + 0x100;
+       /* PAGE_SIZE */
+       unsigned long size = images->ep - image_get_ep(images);
+       char *bootargs = getenv("bootargs");
 
        /* Setup parameters */
-       memset(PARAM, 0, 0x1000);       /* Clear zero page */
-       strcpy(COMMAND_LINE, bootargs);
+       memset(param, 0, size); /* Clear zero page */
+       strcpy(cmdline, bootargs);
 
        kernel();
        /* does not return */