doc: add README for CONFIG_HWCONFIG option

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

diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index fb91c76d94b0885f3d1e2c6e88611e3b1727fcc9..54af24cba3f7cd8af0ed843e72a2399ae07e0ce2 100644 (file)
--- a/lib_mips/bootm.c
+++ b/lib_mips/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>
 #include <asm/addrspace.h>
 
@@ -43,21 +43,18 @@ static int  linux_env_idx;
 static void linux_params_init (ulong start, char * commandline);
 static void linux_env_set (char * env_name, char * env_val);
 
-
-void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
-                    image_header_t *hdr, int verify)
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
-       ulong initrd_start, initrd_end;
-
-       void (*theKernel) (int, char **, char **, int *);
-       char *commandline = getenv ("bootargs");
-       char env_buf[12];
+       void    (*theKernel) (int, char **, char **, int *);
+       char    *commandline = getenv ("bootargs");
+       char    env_buf[12];
+       char    *cp;
 
-       theKernel =
-               (void (*)(int, char **, char **, int *))image_get_ep (hdr);
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
 
-       get_ramdisk (cmdtp, flag, argc, argv, hdr, verify,
-                       IH_ARCH_MIPS, &initrd_start, &initrd_end);
+       /* find kernel entry point */
+       theKernel = (void (*)(int, char **, char **, int *))images->ep;
 
        show_boot_progress (15);
 
@@ -69,23 +66,19 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        linux_params_init (UNCACHED_SDRAM (gd->bd->bi_boot_params), commandline);
 
 #ifdef CONFIG_MEMSIZE_IN_BYTES
-       sprintf (env_buf, "%lu", gd->ram_size);
-#ifdef DEBUG
-       printf ("## Giving linux memsize in bytes, %lu\n", gd->ram_size);
-#endif
+       sprintf (env_buf, "%lu", (ulong)gd->ram_size);
+       debug ("## Giving linux memsize in bytes, %lu\n", (ulong)gd->ram_size);
 #else
-       sprintf (env_buf, "%lu", gd->ram_size >> 20);
-#ifdef DEBUG
-       printf ("## Giving linux memsize in MB, %lu\n", gd->ram_size >> 20);
-#endif
+       sprintf (env_buf, "%lu", (ulong)(gd->ram_size >> 20));
+       debug ("## Giving linux memsize in MB, %lu\n", (ulong)(gd->ram_size >> 20));
 #endif /* CONFIG_MEMSIZE_IN_BYTES */
 
        linux_env_set ("memsize", env_buf);
 
-       sprintf (env_buf, "0x%08X", (uint) UNCACHED_SDRAM (initrd_start));
+       sprintf (env_buf, "0x%08X", (uint) UNCACHED_SDRAM (images->rd_start));
        linux_env_set ("initrd_start", env_buf);
 
-       sprintf (env_buf, "0x%X", (uint) (initrd_end - initrd_start));
+       sprintf (env_buf, "0x%X", (uint) (images->rd_end - images->rd_start));
        linux_env_set ("initrd_size", env_buf);
 
        sprintf (env_buf, "0x%08X", (uint) (gd->bd->bi_flashstart));
@@ -94,10 +87,22 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        sprintf (env_buf, "0x%X", (uint) (gd->bd->bi_flashsize));
        linux_env_set ("flash_size", env_buf);
 
+       cp = getenv("ethaddr");
+       if (cp != NULL) {
+               linux_env_set("ethaddr", cp);
+       }
+
+       cp = getenv("eth1addr");
+       if (cp != NULL) {
+               linux_env_set("eth1addr", cp);
+       }
+
        /* we assume that the kernel is in place */
        printf ("\nStarting kernel ...\n\n");
 
        theKernel (linux_argc, linux_argv, linux_env, 0);
+       /* does not return */
+       return 1;
 }
 
 static void linux_params_init (ulong start, char *line)