File tree Expand file tree Collapse file tree 6 files changed +52
-40
lines changed
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52
TARGET_MCU_NRF52832/device
TARGET_MCU_NRF52840/device Expand file tree Collapse file tree 6 files changed +52
-40
lines changed Original file line number Diff line number Diff line change 10
10
#endif
11
11
12
12
/* If softdevice is present, set aside space for it */
13
- #if defined(SOFTDEVICE_PRESENT)
14
- #define MBED_RAM_START 0x200031D0
15
- #define MBED_RAM_SIZE 0xCE30
16
- #else
17
- #define MBED_RAM_START 0x20000000
18
- #define MBED_RAM_SIZE 0x10000
13
+ #if !defined(MBED_RAM_START)
14
+ #if defined(SOFTDEVICE_PRESENT)
15
+ #define MBED_RAM_START 0x200031D0
16
+ #define MBED_RAM_SIZE 0xCE30
17
+ #else
18
+ #define MBED_RAM_START 0x20000000
19
+ #define MBED_RAM_SIZE 0x10000
20
+ #endif
19
21
#endif
20
22
21
23
#define MBED_RAM0_START MBED_RAM_START
Original file line number Diff line number Diff line change 26
26
#endif
27
27
28
28
/* If softdevice is present, set aside space for it */
29
- #if defined(SOFTDEVICE_PRESENT)
30
- #define MBED_RAM_START 0x200031D0
31
- #define MBED_RAM_SIZE 0xCE30
32
- #else
33
- #define MBED_RAM_START 0x20000000
34
- #define MBED_RAM_SIZE 0x10000
29
+ #if !defined(MBED_RAM_START)
30
+ #if defined(SOFTDEVICE_PRESENT)
31
+ #define MBED_RAM_START 0x200031D0
32
+ #define MBED_RAM_SIZE 0xCE30
33
+ #else
34
+ #define MBED_RAM_START 0x20000000
35
+ #define MBED_RAM_SIZE 0x10000
36
+ #endif
35
37
#endif
36
38
37
39
#define MBED_RAM0_START MBED_RAM_START
@@ -189,7 +191,7 @@ SECTIONS
189
191
PROVIDE (__start_fs_data = .);
190
192
KEEP(*(.fs_data))
191
193
PROVIDE (__stop_fs_data = .);
192
-
194
+
193
195
*(.jcr)
194
196
. = ALIGN (4);
195
197
/* All data end */
Original file line number Diff line number Diff line change @@ -12,12 +12,14 @@ if (!isdefinedsymbol(MBED_APP_SIZE)) {
12
12
}
13
13
14
14
/* If softdevice is present, set aside space for it */
15
- if (isdefinedsymbol(SOFTDEVICE_PRESENT)) {
16
- define symbol MBED_RAM_START = 0x200031D0;
17
- define symbol MBED_RAM_SIZE = 0xCE30;
18
- } else {
19
- define symbol MBED_RAM_START = 0x20000000;
20
- define symbol MBED_RAM_SIZE = 0x10000;
15
+ if (!isdefinedsymbol(MBED_RAM_START)) {
16
+ if (isdefinedsymbol(SOFTDEVICE_PRESENT)) {
17
+ define symbol MBED_RAM_START = 0x200031D0;
18
+ define symbol MBED_RAM_SIZE = 0xCE30;
19
+ } else {
20
+ define symbol MBED_RAM_START = 0x20000000;
21
+ define symbol MBED_RAM_SIZE = 0x10000;
22
+ }
21
23
}
22
24
23
25
define symbol MBED_RAM0_START = MBED_RAM_START;
Original file line number Diff line number Diff line change 9
9
#define MBED_APP_SIZE 0x100000
10
10
#endif
11
11
12
- /* If app_start is 0, do not set aside space for the softdevice */
13
- #if MBED_APP_START == 0
14
- #define MBED_RAM_START 0x20000000
15
- #define MBED_RAM_SIZE 0x40000
16
- #else
17
- #define MBED_RAM_START 0x20003188
18
- #define MBED_RAM_SIZE 0x3CE78
12
+ /* If softdevice is present, set aside space for it */
13
+ #if !defined(MBED_RAM_START)
14
+ #if defined(SOFTDEVICE_PRESENT)
15
+ #define MBED_RAM_START 0x20003188
16
+ #define MBED_RAM_SIZE 0x3CE78
17
+ #else
18
+ #define MBED_RAM_START 0x20000000
19
+ #define MBED_RAM_SIZE 0x40000
20
+ #endif
19
21
#endif
20
22
21
23
#define MBED_RAM0_START MBED_RAM_START
Original file line number Diff line number Diff line change 25
25
#define MBED_APP_SIZE 0x100000
26
26
#endif
27
27
28
- /* If app_start is 0, do not set aside space for the softdevice */
29
- #if MBED_APP_START == 0
30
- #define MBED_RAM_START 0x20000000
31
- #define MBED_RAM_SIZE 0x40000
32
- #else
33
- #define MBED_RAM_START 0x20003188
34
- #define MBED_RAM_SIZE 0x3CE78
28
+ /* If softdevice is present, set aside space for it */
29
+ #if !defined(MBED_RAM_START)
30
+ #if defined(SOFTDEVICE_PRESENT)
31
+ #define MBED_RAM_START 0x20003188
32
+ #define MBED_RAM_SIZE 0x3CE78
33
+ #else
34
+ #define MBED_RAM_START 0x20000000
35
+ #define MBED_RAM_SIZE 0x40000
36
+ #endif
35
37
#endif
36
38
37
39
#define MBED_RAM0_START MBED_RAM_START
Original file line number Diff line number Diff line change @@ -11,13 +11,15 @@ if (!isdefinedsymbol(MBED_APP_SIZE)) {
11
11
define symbol MBED_APP_SIZE = 0x100000;
12
12
}
13
13
14
- /* If app_start is 0, do not set aside space for the softdevice */
15
- if (MBED_APP_START == 0) {
16
- define symbol MBED_RAM_START = 0x20000000;
17
- define symbol MBED_RAM_SIZE = 0x40000;
18
- } else {
19
- define symbol MBED_RAM_START = 0x20003188;
20
- define symbol MBED_RAM_SIZE = 0x3CE78;
14
+ /* If softdevice is present, set aside space for it */
15
+ if (!isdefinedsymbol(MBED_RAM_START)) {
16
+ if (isdefinedsymbol(SOFTDEVICE_PRESENT)) {
17
+ define symbol MBED_RAM_START = 0x20003188;
18
+ define symbol MBED_RAM_SIZE = 0x3CE78;
19
+ } else {
20
+ define symbol MBED_RAM_START = 0x20000000;
21
+ define symbol MBED_RAM_SIZE = 0x40000;
22
+ }
21
23
}
22
24
23
25
define symbol MBED_RAM0_START = MBED_RAM_START;
You can’t perform that action at this time.
0 commit comments