Patch by Christophe Lindheimer, 20 May 2003:

allow the use of CFG_LOADS when CFG_NO_FLASH is set

Patch by Christophe Lindheimer, 20 May 2003:
allow the use of CFG_LOADS when CFG_NO_FLASH is set
wdenk
1 parent 86d82762f6
Showing 2 changed files with 7 additions and 1 deletions Side-by-side Diff
CHANGELOG
common/cmd_boot.c
@@ -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
@@ -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)
...	...	@@ -2,6 +2,9 @@
2	2	Changes since U-Boot 0.3.1:
3	3	======================================================================
4	4
	5	+* Patch by Christophe Lindheimer, 20 May 2003:
	6	+ allow the use of CFG_LOADS when CFG_NO_FLASH is set
	7	+
5	8	* Fix SDRAM timing on Purple board
6	9
7	10	* Add support for CompactFlash on ATC board
...	...	@@ -332,6 +332,7 @@
332	332	case SREC_DATA3:
333	333	case SREC_DATA4:
334	334	store_addr = addr + offset;
	335	+#ifndef CFG_NO_FLASH
335	336	if (addr2info(store_addr)) {
336	337	int rc;
337	338
...	...	@@ -340,7 +341,9 @@
340	341	flash_perror (rc);
341	342	return (~0);
342	343	}
343		- } else {
	344	+ } else
	345	+#endif
	346	+ {
344	347	memcpy ((char *)(store_addr), binbuf, binlen);
345	348	}
346	349	if ((store_addr) < start_addr)