ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update NRF51 link and startup sequence. 

* Update softdevice offset so they match the offset of sd 2.0.
* Update RAM initialization sequence.
* Import fs_data section in final binary
pull/2234/head
Vincent Coubard 2016-06-17 11:22:46 +01:00
parent 3fe77a5efe
commit d1b902a46d
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld
View File

@ -2,8 +2,8 @@
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x0001C000, LENGTH = 0x24000 FLASH (rx) : ORIGIN = 0x0001B000, LENGTH = 0x25000
RAM (rwx) : ORIGIN = 0x20002800, LENGTH = 0x5800 RAM (rwx) : ORIGIN = 0x20002ef8, LENGTH = 0x5108
} }
OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
@ -114,6 +114,15 @@ SECTIONS
} > RAM } > RAM
__edata = .;
.fs_data :
{
PROVIDE(__start_fs_data = .);
KEEP(*(.fs_data))
PROVIDE(__stop_fs_data = .);
} > RAM
.bss : .bss :
{ {
. = ALIGN(4); . = ALIGN(4);

13
hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TOOLCHAIN_GCC_ARM/startup_NRF51822.S
View File

@ -117,8 +117,9 @@ __Vectors:
/* Reset Handler */ /* Reset Handler */
.equ NRF_POWER_RAMON_ADDRESS, 0x40000524 .equ NRF_POWER_RAMON_ADDRESS, 0x40000524
.equ NRF_POWER_RAMON_RAMxON_ONMODE_Msk, 0x3 .equ NRF_POWER_RAMONB_ADDRESS, 0x40000554
.equ NRF_POWER_RAMONx_RAMxON_ONMODE_Msk, 0x3
.text .text
.thumb .thumb
@ -129,10 +130,14 @@ __Vectors:
Reset_Handler: Reset_Handler:
.fnstart .fnstart
/* Make sure ALL RAM banks are powered on */ MOVS R1, #NRF_POWER_RAMONx_RAMxON_ONMODE_Msk
LDR R0, =NRF_POWER_RAMON_ADDRESS LDR R0, =NRF_POWER_RAMON_ADDRESS
LDR R2, [R0] LDR R2, [R0]
MOVS R1, #NRF_POWER_RAMON_RAMxON_ONMODE_Msk ORRS R2, R1
STR R2, [R0]
LDR R0, =NRF_POWER_RAMONB_ADDRESS
LDR R2, [R0]
ORRS R2, R1 ORRS R2, R1
STR R2, [R0] STR R2, [R0]

1
hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TOOLCHAIN_GCC_ARM/NRF52832.ld
View File

@ -83,7 +83,6 @@ SECTIONS
KEEP(*(.eh_frame*)) KEEP(*(.eh_frame*))
} > FLASH } > FLASH
.ARM.extab : .ARM.extab :
{ {
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)