diff --git a/nuttx/configs/stm3210e-eval/RIDE/nuttx.ctx b/nuttx/configs/stm3210e-eval/RIDE/nuttx.ctx index a0085389f..8dad95fea 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/nuttx.ctx +++ b/nuttx/configs/stm3210e-eval/RIDE/nuttx.ctx @@ -1,5 +1,12 @@ + + + + + + + @@ -11,12 +18,8 @@ - - - - \ No newline at end of file diff --git a/nuttx/configs/stm3210e-eval/RIDE/nuttx.dbi b/nuttx/configs/stm3210e-eval/RIDE/nuttx.dbi index 5b4cf3fca..51748d1b0 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/nuttx.dbi +++ b/nuttx/configs/stm3210e-eval/RIDE/nuttx.dbi @@ -9,6 +9,7 @@ DataOffset=0x0 LoaderTool=ARM Target=ARM DebugTool=RLINK_CORTEX +ApplicationComponents= [Device] Name=STM32F101VET6 [ARMSigDrv options] diff --git a/nuttx/configs/stm3210e-eval/RIDE/nuttx.elf.ld b/nuttx/configs/stm3210e-eval/RIDE/nuttx.elf.ld index 4015d6339..f4d3a6ca1 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/nuttx.elf.ld +++ b/nuttx/configs/stm3210e-eval/RIDE/nuttx.elf.ld @@ -14,5 +14,6 @@ INPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\up_h INPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\up_leds.o") INPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\up_boot.o") INPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\irq_unexpectedisr.o") +INPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\lib_memcpy.o") OUTPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\nuttx.elf") INCLUDE "C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\stm32-nuttx.ld" diff --git a/nuttx/configs/stm3210e-eval/RIDE/nuttx.rdb b/nuttx/configs/stm3210e-eval/RIDE/nuttx.rdb index 34b78940b..bba763865 100755 Binary files a/nuttx/configs/stm3210e-eval/RIDE/nuttx.rdb and b/nuttx/configs/stm3210e-eval/RIDE/nuttx.rdb differ diff --git a/nuttx/configs/stm3210e-eval/RIDE/stm32-ld.sh b/nuttx/configs/stm3210e-eval/RIDE/stm32-ld.sh index 29259862d..d9a8bf260 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/stm32-ld.sh +++ b/nuttx/configs/stm3210e-eval/RIDE/stm32-ld.sh @@ -10,9 +10,9 @@ SIZE=arm-none-eabi-size.exe DWF2XML=dwf2xml.exe SCRIPT="C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\nuttx.elf.ld" -LDFLAGS="-mcpu=cortex-m3 -mthumb -u _start -Wl,-static -Wl,--gc-sections -nostartfiles -Wl,--warn-once -nostdlib" +LDFLAGS="-mcpu=cortex-m3 -mthumb -u _start -Wl,-static -nostartfiles -Wl,--warn-once -nostdlib" -${LD} "${LDFLAGS}" -Wl,-T -Xlinker "${SCRIPT}" +${LD} ${LDFLAGS} -Wl,-T -Xlinker "${SCRIPT}" ${OBJCOPY} nuttx.elf --target=ihex nuttx.hex ${REXRDR} nuttx.elf.sizetmp 0 ${SIZE} nuttx.elf ${DWF2XML} nuttx.dbi nuttx-globals.Standard.xml nuttx.Standard.xml ARM diff --git a/nuttx/configs/stm3210e-eval/RIDE/stm32-nuttx.ld b/nuttx/configs/stm3210e-eval/RIDE/stm32-nuttx.ld index 2afd615d2..93bd6bca4 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/stm32-nuttx.ld +++ b/nuttx/configs/stm3210e-eval/RIDE/stm32-nuttx.ld @@ -34,7 +34,10 @@ ****************************************************************************/ /* The STM32F103ZET6 has 512Kb of FLASH beginning at address 0x0800:0000 and - * 64Kb of SRAM beginning at address 0x2000:0000. + * 64Kb of SRAM beginning at address 0x2000:0000. When booting from FLASH, + * FLASH memory is aliased to address 0x0000:0000 where the code expects to + * begin execution by jumping to the entry point in the 0x0800:0000 address + * range. */ MEMORY