From 32e70457f5f84cd5eb673b120be0ccee1412d69a Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 31 Dec 2009 20:39:23 +0000
Subject: [PATCH] update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2472 42af7a65-404d-4744-a932-0658087f49c3
---
ChangeLog | 5 ++++-
Documentation/NuttX.html | 5 ++++-
arch/arm/src/arm/up_head.S | 14 +++++++++-----
configs/ea3131/ostest/defconfig | 1 -
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c37a0776e6..8a1e68f009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1032,4 +1032,7 @@
5.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
* arch/arm/src/lpc313x and arch/arm/include/lpc313x: Added framework
- to support the NXP LPC3131 MCU
+ to support the NXP LPC3131.
+ * Add configs/ea3131. The LPC3131 port for the Embedded Artist EA3131
+ (LPC3131) is code complete and waiting for me to get hardware in
+ hand.
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index fe136065bf..a74262ce41 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
- <p>Last Updated: December 21, 2009</p>
+ <p>Last Updated: December 31, 2009</p>
</td>
</tr>
</table>
@@ -1670,6 +1670,9 @@ nuttx-5.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
* arch/arm/src/lpc313x and arch/arm/include/lpc313x: Added framework
to support the NXP LPC3131 MCU
+ * Add configs/ea3131. The LPC3131 port for the Embedded Artist EA3131
+ (LPC3131) is code complete and waiting for me to get hardware in
+ hand.
pascal-2.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/arch/arm/src/arm/up_head.S b/arch/arm/src/arm/up_head.S
index e829fa9e55..bfe6afa0b7 100644
--- a/arch/arm/src/arm/up_head.S
+++ b/arch/arm/src/arm/up_head.S
@@ -59,29 +59,33 @@
* 1. We execute in place in FLASH (CONFIG_BOOT_RUNFROMFLASH=y). In this case
* the boot logic must:
*
- * - Configure SDRAM and,
- * - Initialize the .data section in RAM.
+ * - Configure SDRAM,
+ * - Initialize the .data section in RAM, and
+ * - Clear .bss section
*/
#ifdef CONFIG_BOOT_RUNFROMFLASH
+# error "Configuration not implemented"
# define CONFIGURE_SDRAM
/* 2. We boot in FLASH but copy ourselves to DRAM from better performance.
* (CONFIG_BOOT_RUNFROMFLASH=n && CONFIG_BOOT_COPYTORAM=y). In this case
* the boot logic must:
*
- * - Configure SDRAM and,
- * - Copy ourself to DRAM (after mapping it)
+ * - Configure SDRAM,
+ * - Copy ourself to DRAM (after mapping it), and
+ * - Clear .bss section
*/
#elif defined(CONFIG_BOOT_COPYTORAM)
+# error "configuration not implemented
# define CONFIG_SDRAM
/* 3. There is bootloader that copies us to DRAM (but probably not to the beginning)
* (CONFIG_BOOT_RUNFROMFLASH=n && CONFIG_BOOT_COPYTORAM=n). In this case the
* boot logic must:
*
- * - Nothing special.
+ * - Clear .bss section
*/
#endif
diff --git a/configs/ea3131/ostest/defconfig b/configs/ea3131/ostest/defconfig
index f45119fdf6..49f2317744 100755
--- a/configs/ea3131/ostest/defconfig
+++ b/configs/ea3131/ostest/defconfig
@@ -749,7 +749,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
# operation from FLASH but must copy initialized .data sections to RAM.
-# (should also be =n for the EA3131 which always runs from flash)
# CONFIG_BOOT_COPYTORAM - Some configurations boot in FLASH
# but copy themselves entirely into RAM for better performance.
# CONFIG_CUSTOM_STACK - The up_ implementation will handle
--
GitLab