i386: Fix race condition when using SC520 timers

[u-boot] / lib_avr32 / bootm.c

diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 455590e37dd6fbbee8f5a4af7108605671bb62d2..6a3172a9a0c11efda750ebe77d91ba03a1b61dd0 100644 (file)
--- a/lib_avr32/bootm.c
+++ b/lib_avr32/bootm.c
@@ -22,17 +22,15 @@
 #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>
+#include <asm/arch/addrspace.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/arch/clk.h>
 
 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);
 
@@ -173,95 +171,26 @@ static void setup_end_tag(struct tag *params)
        params->hdr.size = 0;
 }
 
-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 = 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");
+       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);
-               }
-
-               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);
-       } else {
-               /* no initrd image */
-               show_boot_progress (14);
-               rd_len = rd_data = 0;
-       }
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
 
-       if (rd_data) {
-               initrd_start = rd_data;
-               initrd_end = initrd_start + rd_len;
-       } else {
-               initrd_start = 0;
-               initrd_end = 0;
-       }
+       theKernel = (void *)images->ep;
 
        show_boot_progress (15);
 
        params = params_start = (struct tag *)gd->bd->bi_boot_params;
        params = setup_start_tag(params);
        params = setup_memory_tags(params);
-       if (initrd_start) {
+       if (images->rd_start) {
                params = setup_ramdisk_tag(params,
-                                          PHYSADDR(initrd_start),
-                                          PHYSADDR(initrd_end));
+                                          PHYSADDR(images->rd_start),
+                                          PHYSADDR(images->rd_end));
        }
        params = setup_commandline_tag(params, commandline);
        params = setup_clock_tags(params);
@@ -274,4 +203,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        prepare_to_boot();
 
        theKernel(ATAG_MAGIC, params_start);
+       /* does not return */
+
+       return 1;
 }