Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[platform/kernel/u-boot.git] / lib_microblaze / bootm.c

diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c
index a4fce5a..bce4774 100644 (file)
--- a/lib_microblaze/bootm.c
+++ b/lib_microblaze/bootm.c
@@ -27,105 +27,21 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]);
-
-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)
 {
-       int i;
-       ulong checksum;
-
-       ulong rd_data, rd_len;
-       ulong initrd_start, initrd_end;
-       image_header_t *rd_hdr;
-
        /* First parameter is mapped to $r5 for kernel boot args */
-       void (*theKernel) (char *);
-       char *commandline = getenv ("bootargs");
-
-       theKernel = (void (*)(char *))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_magic (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);
+       void    (*theKernel) (char *);
+       char    *commandline = getenv ("bootargs");
 
-               rd_data = image_get_data (rd_hdr);
-               rd_en = image_get_data_size (rd_hdr);
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
 
-               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_MICROBLAZE) ||
-                   !image_check_type (rd_hdr, IH_TYPE_RAMDISK)) {
-                       printf ("No Linux Microblaze Ramdisk Image\n");
-                       show_boot_progress (-13);
-                       do_reset (cmdtp, flag, argc, argv);
-               }
-
-               /*
-                * 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;
-       }
-
-#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;
-       }
+       theKernel = (void (*)(char *))images->ep;
 
        show_boot_progress (15);
 
@@ -135,4 +51,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 #endif
 
        theKernel (commandline);
+       /* does not return */
+
+       return 1;
 }