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 3d5c3bbc959cd15231a67a450157c97d3207eab2..ae1f869f10d9b31da0e69a4ab75797a955045276 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,77 +28,43 @@
 #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
-
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-
-#ifdef CFG_DEBUG
-static void hexdump (unsigned char *buf, int len)
+#ifdef CONFIG_SYS_DEBUG
+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
 
-void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
-                    bootm_headers_t *images)
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
-       ulong   ep = 0;
-       char    *bootargs = getenv("bootargs");
-
-       /* find kernel entry point */
-       if (images->legacy_hdr_valid) {
-               ep = image_get_ep (images->legacy_hdr_os);
-#if defined(CONFIG_FIT)
-       } else if (images->fit_uname_os) {
-               int ret = fit_image_get_entry (images->fit_hdr_os,
-                               images->fit_noffset_os, &ep);
-               if (ret) {
-                       puts ("Can't get entry point property!\n");
-                       goto error;
-               }
-#endif
-       } else {
-               puts ("Could not find kernel entry point!\n");
-               goto error;
-       }
-       void (*kernel) (void) = (void (*)(void))ep;
+       /* Linux kernel load address */
+       void (*kernel) (void) = (void (*)(void))images->ep;
+       /* empty_zero_page */
+       unsigned char *param
+               = (unsigned char *)image_get_load(images->legacy_hdr_os);
+       /* Linux kernel command line */
+       char *cmdline = (char *)param + 0x100;
+       /* PAGE_SIZE */
+       unsigned long size = images->ep - (unsigned long)param;
+       char *bootargs = getenv("bootargs");
 
-       if (!images->autostart)
-               return ;
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
 
        /* 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 */
-       return;
 
-error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
-       return;
+       return 1;
 }