cmd_bootm.c: Fix problem with '#if (CONFIG_CMD_USB)'

[u-boot] / common / cmd_bootm.c

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 9e5ce4b38fc96228a942e968c020679e15c53aeb..18682fe5a247c1cb538bdbc71c22aeec43b09021 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -36,6 +36,10 @@
 #include <lmb.h>
 #include <asm/byteorder.h>
 
+#if defined(CONFIG_CMD_USB)
+#include <usb.h>
+#endif
+
 #ifdef CFG_HUSH_PARSER
 #include <hush.h>
 #endif
@@ -100,7 +104,6 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 #endif
 #if defined(CONFIG_ARTOS) && defined(CONFIG_PPC)
-extern uchar (*env_get_char)(int); /* Returns a character from the environment */
 static boot_os_fn do_bootm_artos;
 #endif
 
@@ -128,13 +131,14 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        ulong           os_data, os_len;
        ulong           image_start, image_end;
        ulong           load_start, load_end;
-       ulong           mem_start, mem_size;
+       ulong           mem_start;
+       phys_size_t     mem_size;
 
        struct lmb lmb;
 
        memset ((void *)&images, 0, sizeof (images));
-       images.verify = getenv_verify();
-       images.autostart = getenv_autostart();
+       images.verify = getenv_yesno ("verify");
+       images.autostart = getenv_yesno ("autostart");
        images.lmb = &lmb;
 
        lmb_init(&lmb);
@@ -142,7 +146,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        mem_start = getenv_bootm_low();
        mem_size = getenv_bootm_size();
 
-       lmb_add(&lmb, mem_start, mem_size);
+       lmb_add(&lmb, (phys_addr_t)mem_start, mem_size);
 
        board_lmb_reserve(&lmb);
 
@@ -213,6 +217,20 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         */
        iflag = disable_interrupts();
 
+#if defined(CONFIG_CMD_USB)
+       /*
+        * turn off USB to prevent the host controller from writing to the
+        * SDRAM while Linux is booting. This could happen (at least for OHCI
+        * controller), because the HCCA (Host Controller Communication Area)
+        * lies within the SDRAM and the host controller writes continously to
+        * this area (as busmaster!). The HccaFrameNumber is for example
+        * updated every 1 ms within the HCCA structure in SDRAM! For more
+        * details see the OpenHCI specification.
+        */
+       usb_stop();
+#endif
+
+
 #ifdef CONFIG_AMIGAONEG3SE
        /*
         * We've possible left the caches enabled during
@@ -286,9 +304,16 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                debug ("image_start = 0x%lX, image_end = 0x%lx\n", image_start, image_end);
                debug ("load_start = 0x%lx, load_end = 0x%lx\n", load_start, load_end);
 
-               puts ("ERROR: image overwritten - must RESET the board to recover.\n");
-               show_boot_progress (-113);
-               do_reset (cmdtp, flag, argc, argv);
+               if (images.legacy_hdr_valid) {
+                       if (image_get_type (&images.legacy_hdr_os_copy) == IH_TYPE_MULTI)
+                               puts ("WARNING: legacy format multi component "
+                                       "image overwritten\n");
+               } else {
+                       puts ("ERROR: new format image overwritten - "
+                               "must RESET the board to recover\n");
+                       show_boot_progress (-113);
+                       do_reset (cmdtp, flag, argc, argv);
+               }
        }
 
        show_boot_progress (8);
@@ -427,17 +452,6 @@ static int fit_check_kernel (const void *fit, int os_noffset, int verify)
        }
        show_boot_progress (105);
 
-#ifdef CONFIG_LOGBUFFER
-#ifndef CONFIG_ALT_LB_ADDR
-       kbd=gd->bd;
-       /* Prevent initrd from overwriting logbuffer */
-       if (initrd_high < (kbd->bi_memsize-LOGBUFF_LEN-LOGBUFF_OVERHEAD))
-               initrd_high = kbd->bi_memsize-LOGBUFF_LEN-LOGBUFF_OVERHEAD;
-       debug ("## Logbuffer at 0x%08lX ", kbd->bi_memsize-LOGBUFF_LEN);
-#else
-       debug ("## Logbuffer at 0x%08lX ", CONFIG_ALT_LB_ADDR);
-#endif
-#endif
        if (!fit_image_check_target_arch (fit, os_noffset)) {
                puts ("Unsupported Architecture\n");
                show_boot_progress (-105);
@@ -533,9 +547,17 @@ static void *boot_get_kernel (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]
                        show_boot_progress (-5);
                        return NULL;
                }
+
+               /*
+                * copy image header to allow for image overwrites during kernel
+                * decompression.
+                */
+               memmove (&images->legacy_hdr_os_copy, hdr, sizeof(image_header_t));
+
+               /* save pointer to image header */
                images->legacy_hdr_os = hdr;
-               images->legacy_hdr_valid = 1;
 
+               images->legacy_hdr_valid = 1;
                show_boot_progress (6);
                break;
 #if defined(CONFIG_FIT)
@@ -609,7 +631,7 @@ static void *boot_get_kernel (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]
                return NULL;
        }
 
-       debug ("   kernel data at 0x%08lx, len = 0x%08lx (%d)\n",
+       debug ("   kernel data at 0x%08lx, len = 0x%08lx (%ld)\n",
                        *os_data, *os_len, *os_len);
 
        return (void *)img_addr;
@@ -890,7 +912,7 @@ static void do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
         * address of the original image header.
         */
        os_hdr = NULL;
-       if (image_check_type (hdr, IH_TYPE_MULTI)) {
+       if (image_check_type (&images->legacy_hdr_os_copy, IH_TYPE_MULTI)) {
                image_multi_getimg (hdr, 1, &kernel_data, &kernel_len);
                if (kernel_len)
                        os_hdr = hdr;
@@ -947,7 +969,7 @@ static void do_bootm_lynxkdi (cmd_tbl_t *cmdtp, int flag,
                             int argc, char *argv[],
                             bootm_headers_t *images)
 {
-       image_header_t *hdr = images->legacy_hdr_os;
+       image_header_t *hdr = &images->legacy_hdr_os_copy;
 
 #if defined(CONFIG_FIT)
        if (!images->legacy_hdr_valid) {
@@ -964,7 +986,7 @@ static void do_bootm_rtems (cmd_tbl_t *cmdtp, int flag,
                           int argc, char *argv[],
                           bootm_headers_t *images)
 {
-       image_header_t *hdr = images->legacy_hdr_os;
+       image_header_t *hdr = &images->legacy_hdr_os_copy;
        void (*entry_point)(bd_t *);
 
 #if defined(CONFIG_FIT)
@@ -994,10 +1016,10 @@ static void do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag,
                             bootm_headers_t *images)
 {
        char str[80];
-       image_header_t *hdr = images->legacy_hdr_os;
+       image_header_t *hdr = &images->legacy_hdr_os_copy;
 
 #if defined(CONFIG_FIT)
-       if (hdr == NULL) {
+       if (!images->legacy_hdr_valid) {
                fit_unsupported_reset ("VxWorks");
                do_reset (cmdtp, flag, argc, argv);
        }
@@ -1014,7 +1036,7 @@ static void do_bootm_qnxelf(cmd_tbl_t *cmdtp, int flag,
 {
        char *local_args[2];
        char str[16];
-       image_header_t *hdr = images->legacy_hdr_os;
+       image_header_t *hdr = &images->legacy_hdr_os_copy;
 
 #if defined(CONFIG_FIT)
        if (!images->legacy_hdr_valid) {
@@ -1041,7 +1063,7 @@ static void do_bootm_artos (cmd_tbl_t *cmdtp, int flag,
        int i, j, nxt, len, envno, envsz;
        bd_t *kbd;
        void (*entry)(bd_t *bd, char *cmdline, char **fwenv, ulong top);
-       image_header_t *hdr = images->legacy_hdr_os;
+       image_header_t *hdr = &images->legacy_hdr_os_copy;
 
 #if defined(CONFIG_FIT)
        if (!images->legacy_hdr_valid) {