Fix fallout from autostart revert

The autostart revert caused a bit of duplicated code as well as
code that was using images->autostart that needs to get removed so
we can build again.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 2dffdfac883018fac9a6600a5199d30c096597ba..529596926001730d491e23eb35a8593e6d9d1e30 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -361,10 +361,9 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        show_boot_progress (-9);
 #ifdef DEBUG
        puts ("\n## Control returned to monitor - resetting...\n");
-       if (images.autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
 #endif
-       if (!images.autostart && iflag)
+       if (iflag)
                enable_interrupts();
 
        return 1;

diff --git a/common/image.c b/common/image.c
index 180734838949087c3c571ff409998a8950999827..6d2ce32e7d4165bd1cc04164c46d81ab4a0e88d2 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -189,23 +189,6 @@ int image_check_dcrc (image_header_t *hdr)
        return (dcrc == image_get_dcrc (hdr));
 }
 
-void memmove_wd (void *to, void *from, size_t len, ulong chunksz)
-{
-#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-       while (len > 0) {
-               size_t tail = (len > chunksz) ? chunksz : len;
-               WATCHDOG_RESET ();
-               memmove (to, from, tail);
-               to += tail;
-               from += tail;
-               len -= tail;
-       }
-#else  /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
-       memmove (to, from, len);
-#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
-}
-#endif /* USE_HOSTCC */
-
 /**
  * image_multi_count - get component (sub-image) count
  * @hdr: pointer to the header of the multi component image

diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index b838c374ac6aed033106b8ec91d100565eefab20..955a1ae3a200ed108fac0ad4f7cc082006529a6c 100644 (file)
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -137,9 +137,6 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        setup_end_tag (bd);
 #endif
 
-       if (!images->autostart)
-               return ;
-
        /* we assume that the kernel is in place */
        printf ("\nStarting kernel ...\n\n");
 
@@ -157,8 +154,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        return;
 
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
        return;
 }
 

diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 5ff8c79e9b550c4d6297cdcb9c83116b1d46e5e1..60e6b36369223b6b29334b3334d0aaf64166918d 100644 (file)
--- a/lib_avr32/bootm.c
+++ b/lib_avr32/bootm.c
@@ -221,9 +221,6 @@ 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);
 
@@ -234,7 +231,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        return;
 
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
        return;
 }

diff --git a/lib_blackfin/bootm.c b/lib_blackfin/bootm.c
index ef4b1127fcf51811939522a96eac41fea89e4ddd..54f69a92c79a9e96fb82daedc6228f9c6e575780 100644 (file)
--- a/lib_blackfin/bootm.c
+++ b/lib_blackfin/bootm.c
@@ -40,9 +40,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        char    *cmdline;
        ulong   ep = 0;
 
-       if (!images->autostart)
-               return;
-
 #ifdef SHARED_RESOURCES
        swap_to(FLASH);
 #endif
@@ -74,6 +71,5 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        return;
 
  error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
 }

diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c
index d959107c73b76765da250cdd697624ac92718ac6..452eef73bdaf91106b52eef7603e6662996d3e60 100644 (file)
--- a/lib_i386/bootm.c
+++ b/lib_i386/bootm.c
@@ -84,9 +84,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 
        }
 
-       if (!images->autostart)
-               return ;
-
 #ifdef DEBUG
        printf ("## Transferring control to Linux (at address %08x) ...\n",
                (u32)base_ptr);
@@ -100,7 +97,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        return;
 
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
        return;
 }

diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c
index 61f1a3648a9f8b40075c9c7b6f9eb57397c5bf7a..b45203d1706f86de4bb91c2981369cfada8b1da3 100644 (file)
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -129,8 +129,6 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
 
        show_boot_progress (15);
 
-       if (!images->autostart)
-               return;
        /*
         * Linux Kernel Parameters (passing board info data):
         *   r3: ptr to board info data
@@ -144,8 +142,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
        return ;
 
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
        return ;
 }
 

diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c
index 30a03ef35908b2c31000d9c4eeb9dd7166947aa7..68edcdba1d674589b03f3d5838e9cdaa4a5a3840 100644 (file)
--- a/lib_microblaze/bootm.c
+++ b/lib_microblaze/bootm.c
@@ -67,15 +67,11 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                (ulong) theKernel);
 #endif
 
-       if (!images->autostart)
-               return ;
-
        theKernel (commandline);
        /* does not return */
        return;
 
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
        return;
 }

diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index 5c46a5aec361ab8e7e61f5951f07e1be1b1455bc..53e8e19c94e8070657965d373546a108585ae49b 100644 (file)
--- a/lib_mips/bootm.c
+++ b/lib_mips/bootm.c
@@ -120,9 +120,6 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                linux_env_set("eth1addr", cp);
        }
 
-       if (!images->autostart)
-               return ;
-
        /* we assume that the kernel is in place */
        printf ("\nStarting kernel ...\n\n");
 
@@ -131,8 +128,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        return;
 
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
        return;
 }
 

diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index 01f4e87cb43f94db8bd89a7b9cff778cde3c78ba..18cf7736efba956cc892db2f45da4900d1921b89 100644 (file)
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -50,9 +50,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        }
        void (*kernel)(void) = (void (*)(void))ep;
 
-       if (!images->autostart)
-               return ;
-
        /* For now we assume the Microtronix linux ... which only
         * needs to be called ;-)
         */
@@ -61,7 +58,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        return;
 
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
        return;
 }

diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 81803ddef3dd0aca138359374bf123a4641595b9..cbe5592a94893215d77da2dc71984d11ac15e322 100644 (file)
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -277,8 +277,6 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 #if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
        unlock_ram_in_cache();
 #endif
-       if (!images->autostart)
-               return ;
 
 #if defined(CONFIG_OF_LIBFDT)
        if (of_flat_tree) {     /* device tree; boot new style */
@@ -311,8 +309,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        return ;
 
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
        return ;
 }
 

diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c
index dd32a3ed845cfa4cbe459ee38af32b314ba5c344..4ee7ff3fd7e857e977d7e8ae6362a84dc524257a 100644 (file)
--- a/lib_sh/bootm.c
+++ b/lib_sh/bootm.c
@@ -83,9 +83,6 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        }
        void (*kernel) (void) = (void (*)(void))ep;
 
-       if (!images->autostart)
-               return ;
-
        /* Setup parameters */
        memset(PARAM, 0, 0x1000);       /* Clear zero page */
        strcpy(COMMAND_LINE, bootargs);
@@ -95,7 +92,6 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        return;
 
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
        return;
 }

diff --git a/lib_sparc/bootm.c b/lib_sparc/bootm.c
index 8900b2e5814061aaaa4241c6e6ec57b00a07aca8..b1a3d98c155dfb56611a3d5e1685f2ece1aff815 100644 (file)
--- a/lib_sparc/bootm.c
+++ b/lib_sparc/bootm.c
@@ -204,9 +204,6 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        bootargs = getenv("bootargs");
        prepare_bootargs(bootargs);
 
-       if (!images->autostart)
-               return;
-
        /* turn on mmu & setup context table & page table for process 0 (kernel) */
        srmmu_init_cpu((unsigned int)kernel);
 
@@ -220,7 +217,6 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        while (1) ;
 
       error:
-       if (images->autostart)
-               do_reset(cmdtp, flag, argc, argv);
+       do_reset(cmdtp, flag, argc, argv);
        return;
 }