* Get (mostly) rid of CFG_MONITOR_LEN definition; compute real length

[people/ms/u-boot.git] / common / cmd_boot.c

diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index 59bab35dfb7a770fa87ceec9222cea362775604f..4e5ffb0a33cccbfd946524a6e52a8f7771ef9dfe 100644 (file)
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -71,14 +71,14 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        print_num ("flashoffset",   bd->bi_flashoffset  );
        print_num ("sramstart",     bd->bi_sramstart    );
        print_num ("sramsize",      bd->bi_sramsize     );
-#if defined(CONFIG_8xx) || defined(CONFIG_8260)
+#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_8260)
        print_num ("immr_base",     bd->bi_immr_base    );
 #endif
        print_num ("bootflags",     bd->bi_bootflags    );
-#if defined(CONFIG_405GP) || defined(CONFIG_405CR)
+#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_405EP)
        print_str ("procfreq",      strmhz(buf, bd->bi_procfreq));
        print_str ("plb_busfreq",           strmhz(buf, bd->bi_plb_busfreq));
-#if defined(CONFIG_405GP)
+#if defined(CONFIG_405GP) || defined(CONFIG_405EP)
        print_str ("pci_busfreq",           strmhz(buf, bd->bi_pci_busfreq));
 #endif
 #else
@@ -332,6 +332,7 @@ load_serial (ulong offset)
                case SREC_DATA3:
                case SREC_DATA4:
                    store_addr = addr + offset;
+#ifndef CFG_NO_FLASH
                    if (addr2info(store_addr)) {
                        int rc;
 
@@ -340,7 +341,9 @@ load_serial (ulong offset)
                                flash_perror (rc);
                                return (~0);
                        }
-                   } else {
+                   } else
+#endif
+                   {
                        memcpy ((char *)(store_addr), binbuf, binlen);
                    }
                    if ((store_addr) < start_addr)
@@ -1000,14 +1003,14 @@ static int k_recv (void)
                for (;;) {
                        switch (serial_getc ()) {
                        case START_CHAR:        /* start packet */
-                               break;
+                               goto START;
                        case ETX_CHAR:          /* ^C waiting for packet */
                                return (0);
                        default:
                                ;
                        }
                }
-                       
+START:
                /* get length of packet */
                sum = 0;
                new_char = serial_getc ();