board/linkstation/ide.c: Fix compile warning

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

diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c
index 27a2b0d9ab3c6eba7fbc4ee180ff06b180938897..f96d7bd6daa329fb9fe8f9d663306f60ba3d97e9 100644 (file)
--- a/lib_i386/bootm.c
+++ b/lib_i386/bootm.c
@@ -24,108 +24,57 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/zimage.h>
 
 /*cmd_boot.c*/
-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)
 {
-       void *base_ptr;
-
-       ulong os_data, os_len;
-       ulong rd_data, rd_len;
-       ulong initrd_start, initrd_end;
-       image_header_t *rd_hdr;
-
-       /*
-        * Check if there is an initrd image
-        */
-       if (argc >= 3) {
-               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");
-                       do_reset (cmdtp, flag, argc, argv);
-               }
+       void            *base_ptr;
+       ulong           os_data, os_len;
+       image_header_t  *hdr;
 
-               if (!image_check_hcrc (rd_hdr)) {
-                       printf ("Bad Header Checksum\n");
-                       do_reset (cmdtp, flag, argc, argv);
-               }
-
-               print_image_hdr (rd_hdr);
-
-               rd_data = image_get_data (rd_hdr);
-               rd_len = image_get_data_size (rd_hdr);
+#if defined(CONFIG_FIT)
+       const void      *data;
+       size_t          len;
+#endif
 
-               if (verify) {
-                       printf ("   Verifying Checksum ... ");
-                       if (!image_check_dcrc (rd_hdr)) {
-                               printf ("Bad Data CRC\n");
-                               do_reset (cmdtp, flag, argc, argv);
-                       }
-                       printf ("OK\n");
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
+       if (images->legacy_hdr_valid) {
+               hdr = images->legacy_hdr_os;
+               if (image_check_type (hdr, IH_TYPE_MULTI)) {
+                       /* if multi-part image, we need to get first subimage */
+                       image_multi_getimg (hdr, 0, &os_data, &os_len);
+               } else {
+                       /* otherwise get image data */
+                       os_data = image_get_data (hdr);
+                       os_len = image_get_data_size (hdr);
                }
-
-               if (!image_check_os (rd_hdr, IH_OS_LINUX) ||
-                   !image_check_arch (rd_hdr, IH_ARCH_I386) ||
-                   !image_check_type (rd_hdr, IH_TYPE_RAMDISK)) {
-                       printf ("No Linux i386 Ramdisk Image\n");
-                       do_reset (cmdtp, flag, argc, argv);
+#if defined(CONFIG_FIT)
+       } else if (images->fit_uname_os) {
+               ret = fit_image_get_data (images->fit_hdr_os,
+                                       images->fit_noffset_os, &data, &len);
+               if (ret) {
+                       puts ("Can't get image data/size!\n");
+                       goto error;
                }
-
-               /*
-                * 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
-                */
-               image_multi_getimg (hdr, 1, &rd_data, &rd_len);
-       } else {
-               /*
-                * no initrd image
-                */
-               rd_data = rd_len = 0;
-       }
-
-#ifdef DEBUG
-       if (!rd_data) {
-               printf ("No initrd\n");
-       }
+               os_data = (ulong)data;
+               os_len = (ulong)len;
 #endif
-
-       if (rd_data) {
-               initrd_start = rd_data;
-               initrd_end = initrd_start + rd_len;
-               printf ("   Loading Ramdisk to %08lx, end %08lx ... ",
-                       initrd_start, initrd_end);
-               memmove ((void *)initrd_start, (void *)rd_data, rd_len);
-               printf ("OK\n");
-       } else {
-               initrd_start = 0;
-               initrd_end = 0;
-       }
-
-       /* if multi-part image, we need to advance base ptr */
-       if (image_check_type (hdr, IH_TYPE_MULTI)) {
-               image_multi_getimg (hdr, 0, &os_data, &os_len);
        } else {
-               os_data = image_get_data (hdr);
-               os_len = image_get_data_size (hdr);
+               puts ("Could not find kernel image!\n");
+               goto error;
        }
 
        base_ptr = load_zimage ((void*)os_data, os_len,
-                       initrd_start, rd_len, 0);
+                       images->rd_start, images->rd_end - images->rd_start, 0);
 
        if (NULL == base_ptr) {
                printf ("## Kernel loading failed ...\n");
-               do_reset(cmdtp, flag, argc, argv);
+               goto error;
 
        }
 
@@ -138,5 +87,8 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        printf("\nStarting kernel ...\n\n");
 
        boot_zimage(base_ptr);
+       /* does not return */
 
+error:
+       return 1;
 }