sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix SRAM data position

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3711 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-06-16 14:28:18 +00:00
parent 318bb9755b
commit 6da51f74a6
8 changed files with 69 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/avr/src/at90usb/at90usb_head.S
View File

@ -227,6 +227,7 @@ __do_copy_data:
.Lcopyloop: .Lcopyloop:
lpm r0, Z+ lpm r0, Z+
st X+, r0 st X+, r0
.Lcopystart: .Lcopystart:
cpi r26, lo8(_edata) cpi r26, lo8(_edata)
cpc r27, r17 cpc r27, r17
@ -245,6 +246,7 @@ __do_clear_bss:
.Lclearloop: .Lclearloop:
st X+, r1 st X+, r1
.Lclearstart: .Lclearstart:
cpi r26, lo8(_ebss) cpi r26, lo8(_ebss)
cpc r27, r17 cpc r27, r17

2
arch/avr/src/atmega/atmega_head.S
View File

@ -221,6 +221,7 @@ __do_copy_data:
.Lcopyloop: .Lcopyloop:
lpm r0, Z+ lpm r0, Z+
st X+, r0 st X+, r0
.Lcopystart: .Lcopystart:
cpi r26, lo8(_edata) cpi r26, lo8(_edata)
cpc r27, r17 cpc r27, r17
@ -239,6 +240,7 @@ __do_clear_bss:
.Lclearloop: .Lclearloop:
st X+, r1 st X+, r1
.Lclearstart: .Lclearstart:
cpi r26, lo8(_ebss) cpi r26, lo8(_ebss)
cpc r27, r17 cpc r27, r17

10
configs/amber/hello/defconfig
View File

@ -648,7 +648,7 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
# Settings for examples/ostest # Settings for examples/ostest
# #
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
# #
@ -688,7 +688,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_STRERROR=n CONFIG_NSH_STRERROR=n
CONFIG_NSH_LINELEN=64 CONFIG_NSH_LINELEN=64
CONFIG_NSH_STACKSIZE=2048 CONFIG_NSH_STACKSIZE=1024
CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_NESTDEPTH=3
CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLESCRIPT=n
CONFIG_NSH_DISABLEBG=n CONFIG_NSH_DISABLEBG=n
@ -812,9 +812,9 @@ CONFIG_BOOT_RUNFROMFLASH=n
CONFIG_BOOT_COPYTORAM=n CONFIG_BOOT_COPYTORAM=n
CONFIG_CUSTOM_STACK=n CONFIG_CUSTOM_STACK=n
CONFIG_STACK_POINTER= CONFIG_STACK_POINTER=
CONFIG_IDLETHREAD_STACKSIZE=1024 CONFIG_IDLETHREAD_STACKSIZE=512
CONFIG_USERMAIN_STACKSIZE=2048 CONFIG_USERMAIN_STACKSIZE=512
CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_MIN=256
CONFIG_PTHREAD_STACK_DEFAULT=2048 CONFIG_PTHREAD_STACK_DEFAULT=1024
CONFIG_HEAP_BASE= CONFIG_HEAP_BASE=
CONFIG_HEAP_SIZE= CONFIG_HEAP_SIZE=

19
configs/amber/hello/ld.script
View File

@ -1,4 +1,4 @@
/**************************************************************************** /**************************************************************************************
* configs/amber/hello/ld.script * configs/amber/hello/ld.script
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * 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 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * 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 MEMORY
{ {
flash (rx) : ORIGIN = 0, LENGTH = 128K flash (rx) : ORIGIN = 0, LENGTH = 128K
sram (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0 sram (rw!x) : ORIGIN = 0x800100, LENGTH = 4K
eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K
} }
OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr") OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")

18
configs/amber/ostest/ld.script
View File

@ -1,4 +1,4 @@
/**************************************************************************** /**************************************************************************************
* configs/amber/ostest/ld.script * configs/amber/ostest/ld.script
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * 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 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * 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 MEMORY
{ {
flash (rx) : ORIGIN = 0, LENGTH = 128K flash (rx) : ORIGIN = 0, LENGTH = 128K
sram (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0 sram (rw!x) : ORIGIN = 0x800100, LENGTH = 4K
eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K
} }
OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr") OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")

10
configs/micropendous3/hello/defconfig
View File

@ -643,7 +643,7 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
# Settings for examples/ostest # Settings for examples/ostest
# #
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
# #
@ -683,7 +683,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_STRERROR=n CONFIG_NSH_STRERROR=n
CONFIG_NSH_LINELEN=64 CONFIG_NSH_LINELEN=64
CONFIG_NSH_STACKSIZE=2048 CONFIG_NSH_STACKSIZE=1024
CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_NESTDEPTH=3
CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLESCRIPT=n
CONFIG_NSH_DISABLEBG=n CONFIG_NSH_DISABLEBG=n
@ -807,9 +807,9 @@ CONFIG_BOOT_RUNFROMFLASH=n
CONFIG_BOOT_COPYTORAM=n CONFIG_BOOT_COPYTORAM=n
CONFIG_CUSTOM_STACK=n CONFIG_CUSTOM_STACK=n
CONFIG_STACK_POINTER= CONFIG_STACK_POINTER=
CONFIG_IDLETHREAD_STACKSIZE=1024 CONFIG_IDLETHREAD_STACKSIZE=512
CONFIG_USERMAIN_STACKSIZE=2048 CONFIG_USERMAIN_STACKSIZE=512
CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_MIN=256
CONFIG_PTHREAD_STACK_DEFAULT=2048 CONFIG_PTHREAD_STACK_DEFAULT=1024
CONFIG_HEAP_BASE= CONFIG_HEAP_BASE=
CONFIG_HEAP_SIZE= CONFIG_HEAP_SIZE=

19
configs/micropendous3/hello/ld.script
View File

@ -1,4 +1,4 @@
/**************************************************************************** /**************************************************************************************
* configs/micropendous3/hello/ld.script * configs/micropendous3/hello/ld.script
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * 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 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * 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 MEMORY
{ {
flash (rx) : ORIGIN = 0, LENGTH = 128K flash (rx) : ORIGIN = 0, LENGTH = 128K
sram (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0 sram (rw!x) : ORIGIN = 0x800100, LENGTH = 8K
eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K
} }
OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr") OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")

19
configs/micropendous3/ostest/ld.script
View File

@ -1,4 +1,4 @@
/**************************************************************************** /**************************************************************************************
* configs/micropendous3/ostest/ld.script * configs/micropendous3/ostest/ld.script
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * 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 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * 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 MEMORY
{ {
flash (rx) : ORIGIN = 0, LENGTH = 128K flash (rx) : ORIGIN = 0, LENGTH = 128K
sram (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0 sram (rw!x) : ORIGIN = 0x800100, LENGTH = 8K
eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K
} }
OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr") OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")