commit 59de2ed6b5631c709d6e9c6dce7c0bffdf5a2058
author wdenk <wdenk> Tue May 20 10:58:04 2003 +0000
committer wdenk <wdenk> Tue May 20 10:58:04 2003 +0000
tree 54e2c2fd8c76243c01544c041bb3002d0d895e5f
parent 86d82762f685c4554e24628838b19e93c9a38001

Patch by Christophe Lindheimer, 20 May 2003:
allow the use of CFG_LOADS when CFG_NO_FLASH is set

common/cmd_boot.c

diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index 2fc0729..c2897a2 100644
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -332,6 +332,7 @@
 		case SREC_DATA3:
 		case SREC_DATA4:
 		    store_addr = addr + offset;
+#ifndef CFG_NO_FLASH
 		    if (addr2info(store_addr)) {
 			int rc;
 
@@ -340,7 +341,9 @@
 				flash_perror (rc);
 				return (~0);
 			}
-		    } else {
+		    } else
+#endif
+		    {
 			memcpy ((char *)(store_addr), binbuf, binlen);
 		    }
 		    if ((store_addr) < start_addr)