85xx: Add setting of cache props in the device tree.

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

diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 455590e..5ff8c79 100644 (file)
--- a/lib_avr32/bootm.c
+++ b/lib_avr32/bootm.c
@@ -31,11 +31,11 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-
 /* CPU-specific hook to allow flushing of caches, etc. */
 extern void prepare_to_boot(void);
 
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+
 static struct tag *setup_start_tag(struct tag *params)
 {
        params->hdr.tag = ATAG_CORE;
@@ -174,84 +174,37 @@ static void setup_end_tag(struct tag *params)
 }
 
 void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
-                   image_header_t *hdr, int verify)
+                   bootm_headers_t *images)
 {
-       ulong rd_data, rd_len = 0;
-       ulong initrd_start, initrd_end;
-       image_header_t *rd_hdr;
-
-       void (*theKernel)(int magic, void *tagtable);
-       struct tag *params, *params_start;
-       char *commandline = getenv("bootargs");
-
-       theKernel = (void *)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)) {
-                       puts("Bad Magic Number\n");
-                       show_boot_progress (-10);
-                       do_reset(cmdtp, flag, argc, argv);
+       ulong   initrd_start, initrd_end;
+       ulong   ep = 0;
+       void    (*theKernel)(int magic, void *tagtable);
+       struct  tag *params, *params_start;
+       char    *commandline = getenv("bootargs");
+       int     ret;
+
+       /* find kernel entry point */
+       if (images->legacy_hdr_valid) {
+               ep = image_get_ep (&images->legacy_hdr_os_copy);
+#if defined(CONFIG_FIT)
+       } else if (images->fit_uname_os) {
+               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;
                }
-
-               if (!image_check_hcrc (rd_hdr)) {
-                       puts("Bad Header Checksum\n");
-                       show_boot_progress (-11);
-                       do_reset(cmdtp, flag, argc, argv);
-               }
-
-               show_boot_progress (10);
-               print_image_hdr (rd_hdr);
-
-               if (verify) {
-                       puts("   Verifying Checksum ... ");
-                       if (!image_check_dcrc (rd_hdr)) {
-                               puts("Bad Data CRC\n");
-                               show_boot_progress (-12);
-                               do_reset(cmdtp, flag, argc, argv);
-                       }
-                       puts("OK\n");
-               }
-
-               show_boot_progress (11);
-
-               if (!image_check_os (rd_hdr, IH_OS_LINUX) ||
-                   !image_check_arch (rd_hdr, IH_ARCH_AVR32) ||
-                   !image_check_type (rd_hdr, IH_TYPE_RAMDISK)) {
-                       puts("Not a Linux/AVR32 RAMDISK image\n");
-                       show_boot_progress (-13);
-                       do_reset(cmdtp, flag, argc, argv);
-               }
-
-               rd_data = image_get_data (rd_hdr);
-               rd_len = image_get_data_size (rd_hdr);
-
-       } 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);
+#endif
        } else {
-               /* no initrd image */
-               show_boot_progress (14);
-               rd_len = rd_data = 0;
+               puts ("Could not find kernel entry point!\n");
+               goto error;
        }
+       theKernel = (void *)ep;
 
-       if (rd_data) {
-               initrd_start = rd_data;
-               initrd_end = initrd_start + rd_len;
-       } else {
-               initrd_start = 0;
-               initrd_end = 0;
-       }
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_AVR32,
+                       &initrd_start, &initrd_end);
+       if (ret)
+               goto error;
 
        show_boot_progress (15);
 
@@ -268,10 +221,20 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        params = setup_ethernet_tags(params);
        setup_end_tag(params);
 
+       if (!images->autostart)
+               return ;
+
        printf("\nStarting kernel at %p (params at %p)...\n\n",
               theKernel, params_start);
 
        prepare_to_boot();
 
        theKernel(ATAG_MAGIC, params_start);
+       /* does not return */
+       return;
+
+error:
+       if (images->autostart)
+               do_reset (cmdtp, flag, argc, argv);
+       return;
 }