From 59de2ed6b5631c709d6e9c6dce7c0bffdf5a2058 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Tue, 20 May 2003 10:58:04 +0000
Subject: [PATCH] Patch by Christophe Lindheimer, 20 May 2003: allow the use of
CFG_LOADS when CFG_NO_FLASH is set
---
CHANGELOG | 3 +++
common/cmd_boot.c | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index c21c816634e..7b585153c3c 100644
--- 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 2fc0729f3f2..c2897a23579 100644
--- 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)
--
GitLab