diff --git a/arch/avr/src/at90usb/at90usb_head.S b/arch/avr/src/at90usb/at90usb_head.S index a3f56245f7..be40c4c99e 100755 --- a/arch/avr/src/at90usb/at90usb_head.S +++ b/arch/avr/src/at90usb/at90usb_head.S @@ -227,6 +227,7 @@ __do_copy_data: .Lcopyloop: lpm r0, Z+ st X+, r0 + .Lcopystart: cpi r26, lo8(_edata) cpc r27, r17 @@ -245,6 +246,7 @@ __do_clear_bss: .Lclearloop: st X+, r1 + .Lclearstart: cpi r26, lo8(_ebss) cpc r27, r17 diff --git a/arch/avr/src/atmega/atmega_head.S b/arch/avr/src/atmega/atmega_head.S index 9b6581ce76..96edcd9887 100755 --- a/arch/avr/src/atmega/atmega_head.S +++ b/arch/avr/src/atmega/atmega_head.S @@ -221,6 +221,7 @@ __do_copy_data: .Lcopyloop: lpm r0, Z+ st X+, r0 + .Lcopystart: cpi r26, lo8(_edata) cpc r27, r17 @@ -239,6 +240,7 @@ __do_clear_bss: .Lclearloop: st X+, r1 + .Lclearstart: cpi r26, lo8(_ebss) cpc r27, r17 diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig index 1a095a8158..5d0932c09e 100644 --- a/configs/amber/hello/defconfig +++ b/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/configs/amber/hello/ld.script b/configs/amber/hello/ld.script index 4815e4ec00..719f68163c 100644 --- a/configs/amber/hello/ld.script +++ b/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/configs/amber/ostest/ld.script b/configs/amber/ostest/ld.script index e228940de3..86a312ffaf 100644 --- a/configs/amber/ostest/ld.script +++ b/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/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig index 6187a89913..434f73a126 100644 --- a/configs/micropendous3/hello/defconfig +++ b/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/configs/micropendous3/hello/ld.script b/configs/micropendous3/hello/ld.script index 72eb6f5859..5492abda90 100644 --- a/configs/micropendous3/hello/ld.script +++ b/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/configs/micropendous3/ostest/ld.script b/configs/micropendous3/ostest/ld.script index b2b154dfef..fa9758092a 100644 --- a/configs/micropendous3/ostest/ld.script +++ b/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")