Patch by Christophe Lindheimer, 20 May 2003:

allow the use of CFG_LOADS when CFG_NO_FLASH is set

diff --git a/CHANGELOG b/CHANGELOG
index c21c816634eb6be1386d0b33287dc68877bce956..7b585153c3c313583a5627c5d8fb12493f365047 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 0.3.1:
 ======================================================================
 
+* Patch by Christophe Lindheimer, 20 May 2003:
+  allow the use of CFG_LOADS when CFG_NO_FLASH is set
+
 * Fix SDRAM timing on Purple board
 
 * Add support for CompactFlash on ATC board

diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index 2fc0729f3f2e7652dcf261842e808d5847e211c7..c2897a23579bca12f79359d8d7ab81d528f1298f 100644 (file)
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -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)