From: Wolfgang Denk <wd@pollux.denx.de>
Date: Wed, 5 Oct 2005 23:50:50 +0000 (+0200)
Subject: Fix booting from serial dataflash on AT91RM9200
X-Git-Tag: LABEL_2006_03_12_0025~105
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bccae9039e59ac09a776429119389a6a4e679fd7;p=u-boot

Fix booting from serial dataflash on AT91RM9200
Patch by Peter Menzebach, 29 Aug 2005
---

diff --git a/CHANGELOG b/CHANGELOG
index f558718460..802f5d30e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fix booting from serial dataflash on AT91RM9200
+  Patch by Peter Menzebach, 29 Aug 2005
+
 * Add JFFS2 support for TRAB board
   Patch by Martin Krause, 25 Aug 2005
 
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index c200fd8b86..ab6ccbb07c 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -204,19 +204,21 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	}
 	SHOW_BOOT_PROGRESS (3);
 
+#ifdef CONFIG_HAS_DATAFLASH
+	if (addr_dataflash(addr)){
+		len  = ntohl(hdr->ih_size) + sizeof(image_header_t);
+		read_dataflash(addr, len, (char *)CFG_LOAD_ADDR);
+		addr = CFG_LOAD_ADDR;
+	}
+#endif
+
+
 	/* for multi-file images we need the data part, too */
 	print_image_hdr ((image_header_t *)addr);
 
 	data = addr + sizeof(image_header_t);
 	len  = ntohl(hdr->ih_size);
 
-#ifdef CONFIG_HAS_DATAFLASH
-	if (addr_dataflash(addr)){
-		read_dataflash(data, len, (char *)CFG_LOAD_ADDR);
-		data = CFG_LOAD_ADDR;
-	}
-#endif
-
 	if (verify) {
 		puts ("   Verifying Checksum ... ");
 		if (crc32 (0, (char *)data, len) != ntohl(hdr->ih_dcrc)) {