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

nrf: allow target.mbed_ram_start and target.mbed_ram_size to override settings in linker

pull/7957/head
Andrew Leech 2018-08-31 17:25:26 +10:00
parent 340f0a6a57
commit a0d7d4eef7
6 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_ARM_STD/nRF52832.sct
View File

@ -10,6 +10,7 @@
#endif #endif
/* If softdevice is present, set aside space for it */ /* If softdevice is present, set aside space for it */
#if !defined(MBED_RAM_START)
#if defined(SOFTDEVICE_PRESENT) #if defined(SOFTDEVICE_PRESENT)
#define MBED_RAM_START 0x200031D0 #define MBED_RAM_START 0x200031D0
#define MBED_RAM_SIZE 0xCE30 #define MBED_RAM_SIZE 0xCE30
@ -17,6 +18,7 @@
#define MBED_RAM_START 0x20000000 #define MBED_RAM_START 0x20000000
#define MBED_RAM_SIZE 0x10000 #define MBED_RAM_SIZE 0x10000
#endif #endif
#endif
#define MBED_RAM0_START MBED_RAM_START #define MBED_RAM0_START MBED_RAM_START
#define MBED_RAM0_SIZE 0xDC #define MBED_RAM0_SIZE 0xDC

2
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_GCC_ARM/NRF52832.ld
View File

@ -26,6 +26,7 @@
#endif #endif
/* If softdevice is present, set aside space for it */ /* If softdevice is present, set aside space for it */
#if !defined(MBED_RAM_START)
#if defined(SOFTDEVICE_PRESENT) #if defined(SOFTDEVICE_PRESENT)
#define MBED_RAM_START 0x200031D0 #define MBED_RAM_START 0x200031D0
#define MBED_RAM_SIZE 0xCE30 #define MBED_RAM_SIZE 0xCE30
@ -33,6 +34,7 @@
#define MBED_RAM_START 0x20000000 #define MBED_RAM_START 0x20000000
#define MBED_RAM_SIZE 0x10000 #define MBED_RAM_SIZE 0x10000
#endif #endif
#endif
#define MBED_RAM0_START MBED_RAM_START #define MBED_RAM0_START MBED_RAM_START
#define MBED_RAM0_SIZE 0xDC #define MBED_RAM0_SIZE 0xDC

2
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_IAR/nRF52832.icf
View File

@ -12,6 +12,7 @@ if (!isdefinedsymbol(MBED_APP_SIZE)) {
} }
/* If softdevice is present, set aside space for it */ /* If softdevice is present, set aside space for it */
if (!isdefinedsymbol(MBED_RAM_START)) {
if (isdefinedsymbol(SOFTDEVICE_PRESENT)) { if (isdefinedsymbol(SOFTDEVICE_PRESENT)) {
define symbol MBED_RAM_START = 0x200031D0; define symbol MBED_RAM_START = 0x200031D0;
define symbol MBED_RAM_SIZE = 0xCE30; define symbol MBED_RAM_SIZE = 0xCE30;
@ -19,6 +20,7 @@ if (isdefinedsymbol(SOFTDEVICE_PRESENT)) {
define symbol MBED_RAM_START = 0x20000000; define symbol MBED_RAM_START = 0x20000000;
define symbol MBED_RAM_SIZE = 0x10000; define symbol MBED_RAM_SIZE = 0x10000;
} }
}
define symbol MBED_RAM0_START = MBED_RAM_START; define symbol MBED_RAM0_START = MBED_RAM_START;
define symbol MBED_RAM0_SIZE = 0xDC; define symbol MBED_RAM0_SIZE = 0xDC;

12
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM_STD/nRF52840.sct
View File

@ -9,13 +9,15 @@
#define MBED_APP_SIZE 0x100000 #define MBED_APP_SIZE 0x100000
#endif #endif
/* If app_start is 0, do not set aside space for the softdevice */ /* If softdevice is present, set aside space for it */
#if MBED_APP_START == 0 #if !defined(MBED_RAM_START)
#define MBED_RAM_START 0x20000000 #if defined(SOFTDEVICE_PRESENT)
#define MBED_RAM_SIZE 0x40000
#else
#define MBED_RAM_START 0x20003188 #define MBED_RAM_START 0x20003188
#define MBED_RAM_SIZE 0x3CE78 #define MBED_RAM_SIZE 0x3CE78
#else
#define MBED_RAM_START 0x20000000
#define MBED_RAM_SIZE 0x40000
#endif
#endif #endif
#define MBED_RAM0_START MBED_RAM_START #define MBED_RAM0_START MBED_RAM_START

12
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_GCC_ARM/NRF52840.ld
View File

@ -25,13 +25,15 @@
#define MBED_APP_SIZE 0x100000 #define MBED_APP_SIZE 0x100000
#endif #endif
/* If app_start is 0, do not set aside space for the softdevice */ /* If softdevice is present, set aside space for it */
#if MBED_APP_START == 0 #if !defined(MBED_RAM_START)
#define MBED_RAM_START 0x20000000 #if defined(SOFTDEVICE_PRESENT)
#define MBED_RAM_SIZE 0x40000
#else
#define MBED_RAM_START 0x20003188 #define MBED_RAM_START 0x20003188
#define MBED_RAM_SIZE 0x3CE78 #define MBED_RAM_SIZE 0x3CE78
#else
#define MBED_RAM_START 0x20000000
#define MBED_RAM_SIZE 0x40000
#endif
#endif #endif
#define MBED_RAM0_START MBED_RAM_START #define MBED_RAM0_START MBED_RAM_START

12
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_IAR/nRF52840.icf
View File

@ -11,13 +11,15 @@ if (!isdefinedsymbol(MBED_APP_SIZE)) {
define symbol MBED_APP_SIZE = 0x100000; define symbol MBED_APP_SIZE = 0x100000;
} }
/* If app_start is 0, do not set aside space for the softdevice */ /* If softdevice is present, set aside space for it */
if (MBED_APP_START == 0) { if (!isdefinedsymbol(MBED_RAM_START)) {
define symbol MBED_RAM_START = 0x20000000; if (isdefinedsymbol(SOFTDEVICE_PRESENT)) {
define symbol MBED_RAM_SIZE = 0x40000;
} else {
define symbol MBED_RAM_START = 0x20003188; define symbol MBED_RAM_START = 0x20003188;
define symbol MBED_RAM_SIZE = 0x3CE78; define symbol MBED_RAM_SIZE = 0x3CE78;
} else {
define symbol MBED_RAM_START = 0x20000000;
define symbol MBED_RAM_SIZE = 0x40000;
}
} }
define symbol MBED_RAM0_START = MBED_RAM_START; define symbol MBED_RAM0_START = MBED_RAM_START;