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

Fix: reverted unwanted changes in ARM5's scatter files of legacy nRF51822 targets. Applied proper changes to ARM5's scatter files of nRF5 regular targets. Improvement: Remove hardcoding of FLASH vector address, now FLASH vector address is imported form linker to C code. 

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
pull/3144/head
Andrzej Puzdrowski 2016-10-07 09:12:03 +02:00 committed by Anna Bridge
parent bd18ede438
commit e3d12d4047
7 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
targets/TARGET_NORDIC/TARGET_MCU_NRF51822/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/nRF51822.sct
View File

@ -18,10 +18,7 @@ LR_IROM1 0x1C000 0x0024000 {
*(InRoot$$Sections)
.ANY (+RO)
}
RW_IRAM0 0x20002800 UNINIT 0x000000c0 { ;no init section
*(noinit)
}
RW_IRAM1 0x200028C0 0x00005740 {
RW_IRAM1 0x20002800 0x00005800 {
.ANY (+RW +ZI)
}
}

5
targets/TARGET_NORDIC/TARGET_MCU_NRF51822/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S110/nRF51822.sct
View File

@ -18,10 +18,7 @@ LR_IROM1 0x18000 0x0028000 {
*(InRoot$$Sections)
.ANY (+RO)
}
RW_IRAM0 0x20002000 UNINIT 0x000000c0 { ;no init section
*(noinit)
}
RW_IRAM1 0x200020C0 0x00001F40 {
RW_IRAM1 0x20002000 0x00002000 {
.ANY (+RW +ZI)
}
}

5
targets/TARGET_NORDIC/TARGET_MCU_NRF51822/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S130/nRF51822.sct
View File

@ -18,10 +18,7 @@ LR_IROM1 0x1C000 0x0024000 {
*(InRoot$$Sections)
.ANY (+RO)
}
RW_IRAM0 0x20002800 UNINIT 0x000000c0 { ;no init section
*(noinit)
}
RW_IRAM1 0x200028C0 0x00001740 {
RW_IRAM1 0x20002800 0x00001800 {
.ANY (+RW +ZI)
}
}

9
targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/nRF51822.sct
View File

@ -12,13 +12,16 @@
;
;WITH SOFTDEVICE:
LR_IROM1 0x0001B000 0x0025000 {
ER_IROM1 0x0001B000 0x0025000 {
LR_IROM1 0x1B000 0x0025000 {
ER_IROM1 0x1B000 0x0025000 {
*.o (RESET, +First)
*(InRoot$$Sections)
.ANY (+RO)
}
RW_IRAM1 0x20002ef8 0x5108 {
RW_IRAM0 0x20002ef8 UNINIT 0x000000c0 { ;no init section
*(noinit)
}
RW_IRAM1 0x20002FB8 0x00005048 {
.ANY (+RW +ZI)
}
}

9
targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S110/nRF51822.sct
View File

@ -12,13 +12,16 @@
;
;WITH SOFTDEVICE:
LR_IROM1 0x0001B000 0x0025000 {
ER_IROM1 0x0001B000 0x0025000 {
LR_IROM1 0x18000 0x0028000 {
ER_IROM1 0x18000 0x0028000 {
*.o (RESET, +First)
*(InRoot$$Sections)
.ANY (+RO)
}
RW_IRAM1 0x20002ef8 0x1108 {
RW_IRAM0 0x20002000 UNINIT 0x000000c0 { ;no init section
*(noinit)
}
RW_IRAM1 0x200020C0 0x00001F40 {
.ANY (+RW +ZI)
}
}

5
targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S130/nRF51822.sct
View File

@ -18,7 +18,10 @@ LR_IROM1 0x0001B000 0x0025000 {
*(InRoot$$Sections)
.ANY (+RO)
}
RW_IRAM1 0x20002ef8 0x1108 {
RW_IRAM0 0x20002ef8 UNINIT 0x000000c0 { ;no init section
*(noinit)
}
RW_IRAM1 0x20002FB8 0x00001048 {
.ANY (+RW +ZI)
}
}

9
targets/TARGET_NORDIC/TARGET_NRF5/reloc_vector_table.c
View File

@ -56,13 +56,8 @@
typedef void (*generic_irq_handler_t)(void);
#ifdef NRF52
#define VECTORS_FLASH_START 0x1C000
#endif
#ifdef NRF51
#define VECTORS_FLASH_START 0x1B000
#endif
extern uint32_t __Vectors[];
#define VECTORS_FLASH_START __Vectors
/**
* @brief Function for relocation of the vector to RAM on nRF5x devices.