Skip to content

Commit 43bae17

Browse files
sg-sg-
authored
Merge pull request #2280 from pan-/nrf-standard-build
Change default_build from small to standard on NRF based targets with at least 32K of RAM.
2 parents 2a7d364 + a7d1bf7 commit 43bae17

File tree

15 files changed

+17
-19
lines changed

15 files changed

+17
-19
lines changed

‎TESTS/mbedmicro-rtos-mbed/basic/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
2525
#define STACK_SIZE 1536
2626
#elif defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832)
27-
#define STACK_SIZE 512
27+
#define STACK_SIZE 768
2828
#else
2929
#define STACK_SIZE DEFAULT_STACK_SIZE
3030
#endif

‎TESTS/mbedmicro-rtos-mbed/isr/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
2828
#define STACK_SIZE 1536
2929
#elif defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832)
30-
#define STACK_SIZE 512
30+
#define STACK_SIZE 768
3131
#else
3232
#define STACK_SIZE DEFAULT_STACK_SIZE
3333
#endif

‎TESTS/mbedmicro-rtos-mbed/mail/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ typedef struct {
3535
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
3636
#define STACK_SIZE 1536
3737
#elif defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832)
38-
#define STACK_SIZE 512
38+
#define STACK_SIZE 768
3939
#else
4040
#define STACK_SIZE DEFAULT_STACK_SIZE
4141
#endif

‎TESTS/mbedmicro-rtos-mbed/mutex/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
3838
#define STACK_SIZE 1536
3939
#elif defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832)
40-
#define STACK_SIZE 512
40+
#define STACK_SIZE 1024
4141
#else
4242
#define STACK_SIZE DEFAULT_STACK_SIZE
4343
#endif

‎TESTS/mbedmicro-rtos-mbed/queue/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ typedef struct {
3535
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
3636
#define STACK_SIZE 1536
3737
#elif defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832)
38-
#define STACK_SIZE 512
38+
#define STACK_SIZE 768
3939
#else
4040
#define STACK_SIZE DEFAULT_STACK_SIZE
4141
#endif

‎TESTS/mbedmicro-rtos-mbed/semaphore/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
4141
#define STACK_SIZE 1536
4242
#elif defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832)
43-
#define STACK_SIZE 512
43+
#define STACK_SIZE 768
4444
#else
4545
#define STACK_SIZE DEFAULT_STACK_SIZE
4646
#endif

‎TESTS/mbedmicro-rtos-mbed/signals/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const int SIGNAL_HANDLE_DELEY = 25;
2626
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
2727
#define STACK_SIZE 1536
2828
#elif defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832)
29-
#define STACK_SIZE 512
29+
#define STACK_SIZE 768
3030
#else
3131
#define STACK_SIZE DEFAULT_STACK_SIZE
3232
#endif

‎hal/targets.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,14 +1195,14 @@
11951195
"toolchains": ["ARM_STD", "GCC_ARM"]
11961196
},
11971197
"program_cycle_s": 6,
1198-
"default_build": "small",
11991198
"features": ["BLE"]
12001199
},
12011200
"MCU_NRF51_16K_BASE": {
12021201
"inherits": ["MCU_NRF51"],
12031202
"extra_labels_add": ["MCU_NORDIC_16K", "MCU_NRF51_16K"],
12041203
"macros_add": ["TARGET_MCU_NORDIC_16K", "TARGET_MCU_NRF51_16K"],
1205-
"public": false
1204+
"public": false,
1205+
"default_build": "small"
12061206
},
12071207
"MCU_NRF51_16K_BOOT_BASE": {
12081208
"inherits": ["MCU_NRF51_16K_BASE"],
@@ -1860,7 +1860,6 @@
18601860
"toolchains": ["ARM_STD", "GCC_ARM", "IAR"]
18611861
},
18621862
"program_cycle_s": 6,
1863-
"default_build": "small",
18641863
"features": ["BLE"],
18651864
"config":{
18661865
"lf_clock_src": {
@@ -1912,8 +1911,7 @@
19121911
"value": "NRF_LF_SRC_XTAL",
19131912
"macro_name": "MBED_CONF_NORDIC_NRF_LF_CLOCK_SRC"
19141913
}
1915-
},
1916-
"default_build": "small"
1914+
}
19171915
},
19181916
"NRF52_DK": {
19191917
"supported_form_factors": ["ARDUINO"],

‎libraries/tests/rtos/mbed/basic/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
2525
#define STACK_SIZE 1536
2626
#elif defined(TARGET_MCU_NRF51822)
27-
#define STACK_SIZE 512
27+
#define STACK_SIZE 768
2828
#else
2929
#define STACK_SIZE DEFAULT_STACK_SIZE
3030
#endif

‎libraries/tests/rtos/mbed/isr/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
2828
#define STACK_SIZE 1536
2929
#elif defined(TARGET_MCU_NRF51822)
30-
#define STACK_SIZE 512
30+
#define STACK_SIZE 768
3131
#else
3232
#define STACK_SIZE DEFAULT_STACK_SIZE
3333
#endif

‎libraries/tests/rtos/mbed/mail/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ typedef struct {
3535
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
3636
#define STACK_SIZE 1536
3737
#elif defined(TARGET_MCU_NRF51822)
38-
#define STACK_SIZE 512
38+
#define STACK_SIZE 768
3939
#else
4040
#define STACK_SIZE DEFAULT_STACK_SIZE
4141
#endif

‎libraries/tests/rtos/mbed/mutex/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
3838
#define STACK_SIZE 1536
3939
#elif defined(TARGET_MCU_NRF51822)
40-
#define STACK_SIZE 512
40+
#define STACK_SIZE 768
4141
#else
4242
#define STACK_SIZE DEFAULT_STACK_SIZE
4343
#endif

‎libraries/tests/rtos/mbed/queue/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ typedef struct {
3535
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
3636
#define STACK_SIZE 1536
3737
#elif defined(TARGET_MCU_NRF51822)
38-
#define STACK_SIZE 512
38+
#define STACK_SIZE 768
3939
#else
4040
#define STACK_SIZE DEFAULT_STACK_SIZE
4141
#endif

‎libraries/tests/rtos/mbed/semaphore/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
4141
#define STACK_SIZE 1536
4242
#elif defined(TARGET_MCU_NRF51822)
43-
#define STACK_SIZE 512
43+
#define STACK_SIZE 768
4444
#else
4545
#define STACK_SIZE DEFAULT_STACK_SIZE
4646
#endif

‎libraries/tests/rtos/mbed/signals/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#elif (defined(TARGET_EFM32GG_STK3700)) && !defined(TOOLCHAIN_ARM_MICRO)
2727
#define STACK_SIZE 1536
2828
#elif defined(TARGET_MCU_NRF51822)
29-
#define STACK_SIZE 512
29+
#define STACK_SIZE 768
3030
#else
3131
#define STACK_SIZE DEFAULT_STACK_SIZE
3232
#endif

0 commit comments

Comments
 (0)