Fix SRAM data position

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3711 42af7a65-404d-4744-a932-0658087f49c3

6 files changed, 65 insertions, 30 deletions

diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig
index 1a095a815..5d0932c09 100644
--- a/nuttx/configs/amber/hello/defconfig
+++ b/nuttx/configs/amber/hello/defconfig
@@ -648,7 +648,7 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 # Settings for examples/ostest
 #
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
-CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
+CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
@@ -688,7 +688,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_STACKSIZE=1024
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n
@@ -812,9 +812,9 @@ CONFIG_BOOT_RUNFROMFLASH=n
 CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_IDLETHREAD_STACKSIZE=512
+CONFIG_USERMAIN_STACKSIZE=512
 CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
+CONFIG_PTHREAD_STACK_DEFAULT=1024
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
diff --git a/nuttx/configs/amber/hello/ld.script b/nuttx/configs/amber/hello/ld.script
index 4815e4ec0..719f68163 100644
--- a/nuttx/configs/amber/hello/ld.script
+++ b/nuttx/configs/amber/hello/ld.script
@@ -1,4 +1,4 @@
-/****************************************************************************
+/**************************************************************************************
  * configs/amber/hello/ld.script
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
@@ -31,14 +31,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ****************************************************************************/
-/* Memory Regions ***********************************************************/
+ **************************************************************************************/
+
+/* Memory Regions *********************************************************************/
+/* -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ *                FLASH        | REGISTERS I/O       EXT I/O    ISRAM      | EEPROM
+ *                             |           REGISTERS REGISTERS             |
+ * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ * ATMEGA128*     0x0000 128Kb | 0x0000 32 0x0020 64 0x0060 160 0x0100 4Kb | 0x0000 4Kb
+ * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ * *Memory configuration A
+ */
 
 MEMORY
 {
 	flash    (rx) : ORIGIN = 0, LENGTH = 128K
-	sram   (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0
-	eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
+	sram   (rw!x) : ORIGIN = 0x800100, LENGTH = 4K
+	eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K
 }
 
 OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
diff --git a/nuttx/configs/amber/ostest/ld.script b/nuttx/configs/amber/ostest/ld.script
index e228940de..86a312ffa 100644
--- a/nuttx/configs/amber/ostest/ld.script
+++ b/nuttx/configs/amber/ostest/ld.script
@@ -1,4 +1,4 @@
-/****************************************************************************
+/**************************************************************************************
  * configs/amber/ostest/ld.script
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
@@ -31,14 +31,22 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ****************************************************************************/
-/* Memory Regions ***********************************************************/
+ **************************************************************************************/
+/* Memory Regions *********************************************************************/
+/* -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ *                FLASH        | REGISTERS I/O       EXT I/O    ISRAM      | EEPROM
+ *                             |           REGISTERS REGISTERS             |
+ * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ * ATMEGA128*     0x0000 128Kb | 0x0000 32 0x0020 64 0x0060 160 0x0100 4Kb | 0x0000 4Kb
+ * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ * *Memory configuration A
+ */
 
 MEMORY
 {
 	flash    (rx) : ORIGIN = 0, LENGTH = 128K
-	sram   (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0
-	eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
+	sram   (rw!x) : ORIGIN = 0x800100, LENGTH = 4K
+	eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K
 }
 
 OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
diff --git a/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig
index 6187a8991..434f73a12 100644
--- a/nuttx/configs/micropendous3/hello/defconfig
+++ b/nuttx/configs/micropendous3/hello/defconfig
@@ -643,7 +643,7 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 # Settings for examples/ostest
 #
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
-CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
+CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
@@ -683,7 +683,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_STACKSIZE=1024
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n
@@ -807,9 +807,9 @@ CONFIG_BOOT_RUNFROMFLASH=n
 CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_IDLETHREAD_STACKSIZE=512
+CONFIG_USERMAIN_STACKSIZE=512
 CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
+CONFIG_PTHREAD_STACK_DEFAULT=1024
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
diff --git a/nuttx/configs/micropendous3/hello/ld.script b/nuttx/configs/micropendous3/hello/ld.script
index 72eb6f585..5492abda9 100644
--- a/nuttx/configs/micropendous3/hello/ld.script
+++ b/nuttx/configs/micropendous3/hello/ld.script
@@ -1,4 +1,4 @@
-/****************************************************************************
+/**************************************************************************************
  * configs/micropendous3/hello/ld.script
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
@@ -31,14 +31,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ****************************************************************************/
-/* Memory Regions ***********************************************************/
+ **************************************************************************************/
+
+/* Memory Regions *********************************************************************/
+/* -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ *                FLASH        | REGISTERS I/O       EXT I/O    ISRAM      | EEPROM
+ *                             |           REGISTERS REGISTERS             |
+ * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ * AT90USB646/7   0x0000  64Kb | 0x0000 32 0x0020 64 0x0060 160 0x0100 4Kb | 0x0000 2Kb
+ * AT90USB1286/7  0x0000 128Kb | 0x0000 32 0x0020 64 0x0060 160 0x0100 8Kb | 0x0000 4Kb
+ * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ */
 
 MEMORY
 {
 	flash    (rx) : ORIGIN = 0, LENGTH = 128K
-	sram   (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0
-	eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
+	sram   (rw!x) : ORIGIN = 0x800100, LENGTH = 8K
+	eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K
 }
 
 OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
diff --git a/nuttx/configs/micropendous3/ostest/ld.script b/nuttx/configs/micropendous3/ostest/ld.script
index b2b154dfe..fa9758092 100644
--- a/nuttx/configs/micropendous3/ostest/ld.script
+++ b/nuttx/configs/micropendous3/ostest/ld.script
@@ -1,4 +1,4 @@
-/****************************************************************************
+/**************************************************************************************
  * configs/micropendous3/ostest/ld.script
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
@@ -31,14 +31,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ****************************************************************************/
-/* Memory Regions ***********************************************************/
+ **************************************************************************************/
+
+/* Memory Regions *********************************************************************/
+/* -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ *                FLASH        | REGISTERS I/O       EXT I/O    ISRAM      | EEPROM
+ *                             |           REGISTERS REGISTERS             |
+ * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ * AT90USB646/7   0x0000  64Kb | 0x0000 32 0x0020 64 0x0060 160 0x0100 4Kb | 0x0000 2Kb
+ * AT90USB1286/7  0x0000 128Kb | 0x0000 32 0x0020 64 0x0060 160 0x0100 8Kb | 0x0000 4Kb
+ * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ */
 
 MEMORY
 {
 	flash    (rx) : ORIGIN = 0, LENGTH = 128K
-	sram   (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0
-	eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
+	sram   (rw!x) : ORIGIN = 0x800100, LENGTH = 8K
+	eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K
 }
 
 OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")