diff --git a/ChangeLog b/ChangeLog index c37a0776e6773ab967fbdbcc3d587f646750ff4c..8a1e68f0095d2d9e965a055325545daf314ad4ec 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 fe136065bfd70cbafd303117cd46daa5bdbe23f5..a74262ce41b6c74aa6095dd42268ddc785b71f70 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 e829fa9e556de6230f656bed33947ab30773206f..bfe6afa0b79b32f2e58bb04cad913a18b388ba6e 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 f45119fdf6a0ceeec362d4ad8c1328d92a8a6499..49f231774446d66a36271c31a73875c5c48e412d 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