ppc: Move conditional compilation of kgdb.c to Makefile

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

diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index 7ea7571a816816f5f69e425548ee29906e732537..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>
 
@@ -33,8 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define        LINUX_MAX_ENVS          256
 #define        LINUX_MAX_ARGS          256
 
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-
 static int     linux_argc;
 static char ** linux_argv;
 
@@ -45,99 +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 rd_data, rd_len;
-       ulong initrd_start, initrd_end;
-       image_header_t *rd_hdr;
-
-       void (*theKernel) (int, char **, char **, int *);
-       char *commandline = getenv ("bootargs");
-       char env_buf[12];
-
-       theKernel =
-               (void (*)(int, char **, char **, int *))image_get_ep (hdr);
-
-       /*
-        * Check if there is an initrd image
-        */
-       if (argc >= 3) {
-               show_boot_progress (9);
-
-               rd_hdr = (image_header_t *)simple_strtoul (argv[2], NULL, 16);
-               printf ("## Loading Ramdisk Image at %08lx ...\n", rd_hdr);
-
-               if (!image_check_magic (rd_hdr)) {
-                       printf ("Bad Magic Number\n");
-                       show_boot_progress (-10);
-                       do_reset (cmdtp, flag, argc, argv);
-               }
-
-               if (!image_check_hcrc (rd_hdr)) {
-                       printf ("Bad Header Checksum\n");
-                       show_boot_progress (-11);
-                       do_reset (cmdtp, flag, argc, argv);
-               }
-
-               show_boot_progress (10);
-               print_image_hdr (rd_hdr);
-
-               rd_data = image_get_data (rd_hdr);
-               rd_len = image_get_data_size (rd_hdr);
-
-               if (verify) {
-                       printf ("   Verifying Checksum ... ");
-                       if (!image_check_dcrc (rd_hdr)) {
-                               printf ("Bad Data CRC\n");
-                               show_boot_progress (-12);
-                               do_reset (cmdtp, flag, argc, argv);
-                       }
-                       printf ("OK\n");
-               }
-
-               show_boot_progress (11);
-
-               if (!image_check_os (rd_hdr, IH_OS_LINUX) ||
-                   !image_check_arch (rd_hdr, IH_ARCH_MIPS) ||
-                   !image_check_type (rd_hdr, IH_TYPE_RAMDISK)) {
-                       printf ("No Linux MIPS Ramdisk Image\n");
-                       show_boot_progress (-13);
-                       do_reset (cmdtp, flag, argc, argv);
-               }
+       void    (*theKernel) (int, char **, char **, int *);
+       char    *commandline = getenv ("bootargs");
+       char    env_buf[12];
+       char    *cp;
 
-               /*
-                * Now check if we have a multifile image
-                */
-       } else if (image_check_type (hdr, IH_TYPE_MULTI)) {
-               /*
-                * Get second entry data start address and len
-                */
-               show_boot_progress (13);
-               image_multi_getimg (hdr, 1, &rd_data, &rd_len);
-       } else {
-               /*
-                * no initrd image
-                */
-               show_boot_progress (14);
-
-               rd_data = rd_len = 0;
-       }
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
 
-#ifdef DEBUG
-       if (!rd_data) {
-               printf ("No initrd\n");
-       }
-#endif
-
-       if (rd_data) {
-               initrd_start = rd_data;
-               initrd_end = initrd_start + rd_len;
-       } else {
-               initrd_start = 0;
-               initrd_end = 0;
-       }
+       /* find kernel entry point */
+       theKernel = (void (*)(int, char **, char **, int *))images->ep;
 
        show_boot_progress (15);
 
@@ -149,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));
@@ -174,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)