From 1abc828bc9027638c65d7b284ced437e4abf109e Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 1 Jun 2009 20:50:50 +0000
Subject: [PATCH] Remove RUNFROMFLASH option from str-p711

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1845 42af7a65-404d-4744-a932-0658087f49c3
---
 arch/arm/src/str71x/str71x_head.S | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/arm/src/str71x/str71x_head.S b/arch/arm/src/str71x/str71x_head.S
index 2e5eaef5c3..fd7f263e73 100644
--- a/arch/arm/src/str71x/str71x_head.S
+++ b/arch/arm/src/str71x/str71x_head.S
@@ -509,19 +509,16 @@ __flashstart:
 	strcc	r0, [r4], #4
 	bcc	1b
 
-	/* Copy system .data sections to new home in RAM. */
-
-#ifdef CONFIG_BOOT_RUNFROMFLASH
+	/* Copy system .data sections from FLASH to new home in RAM. */
 
 	adr	r3, LC2
 	ldmia	r3, {r0, r1, r2}
 
-1:	ldmia	r0!, {r3 - r10}
+2:	ldmia	r0!, {r3 - r10}
 	stmia	r1!, {r3 - r10}
 	cmp	r1, r2
-	blt	1b
+	blt	2b
 
-#endif
 	/* Initialize clocking */
 
 	bl	str71x_prccuinit
@@ -602,11 +599,9 @@ LC0:	.long	_sbss
 	.long	_ebss
 	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 
-#ifdef CONFIG_BOOT_RUNFROMFLASH
 LC2:	.long	_eronly	/* Where .data defaults are stored in FLASH */
 	.long	_sdata	/* Where .data needs to reside in SDRAM */
 	.long	_edata
-#endif
 	.size	__start, .-__start
 
 	/* This global variable is unsigned long g_heapbase and is