net: make ARP timeout configurable

[u-boot] / lib_avr32 / bootm.c

diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index a934cae9d98e84820bbe04ea5269bf1853a4bbbe..b1c651ab2cdd15ab22e147032d2fb0c484071aba 100644 (file)
--- a/lib_avr32/bootm.c
+++ b/lib_avr32/bootm.c
@@ -34,6 +34,8 @@ DECLARE_GLOBAL_DATA_PTR;
 /* 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;
@@ -172,18 +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 initrd_start, initrd_end;
-
-       void (*theKernel)(int magic, void *tagtable);
-       struct tag *params, *params_start;
-       char *commandline = getenv("bootargs");
-
-       theKernel = (void *)image_get_ep (hdr);
+       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);
+#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;
+               }
+#endif
+       } else {
+               puts ("Could not find kernel entry point!\n");
+               goto error;
+       }
+       theKernel = (void *)ep;
 
-       get_ramdisk (cmdtp, flag, argc, argv, hdr, verify,
-                       IH_ARCH_AVR32, &initrd_start, &initrd_end);
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_AVR32,
+                       &initrd_start, &initrd_end);
+       if (ret)
+               goto error;
 
        show_boot_progress (15);
 
@@ -200,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;
 }