Skip to content

Commit 7643399

Browse files
0xc01700xc0170
committed
Merge pull request #1835 from stevew817/feature/rtos_support_efm32
[Silicon Labs] Disable RTOS support for EFM32ZG
2 parents 5df96fb + d14fc7f commit 7643399

File tree

11 files changed

+19
-20
lines changed

11 files changed

+19
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define STACK_SIZE DEFAULT_STACK_SIZE/2
1414
#elif (defined(TARGET_STM32F030R8)) && defined(TOOLCHAIN_IAR)
1515
#define STACK_SIZE DEFAULT_STACK_SIZE/2
16-
#elif (defined(TARGET_EFM32ZG_STK3200) || defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
16+
#elif (defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
1717
#define STACK_SIZE 512
1818
#elif (defined(TARGET_EFM32LG_STK3600) || defined(TARGET_EFM32WG_STK3800) || defined(TARGET_EFM32PG_STK3401)) && !defined(TOOLCHAIN_ARM_MICRO)
1919
#define STACK_SIZE 768

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define STACK_SIZE DEFAULT_STACK_SIZE/4
1717
#elif (defined(TARGET_STM32F030R8)) && defined(TOOLCHAIN_IAR)
1818
#define STACK_SIZE DEFAULT_STACK_SIZE/2
19-
#elif (defined(TARGET_EFM32ZG_STK3200) || defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
19+
#elif (defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
2020
#define STACK_SIZE 512
2121
#elif (defined(TARGET_EFM32LG_STK3600) || defined(TARGET_EFM32WG_STK3800) || defined(TARGET_EFM32PG_STK3401)) && !defined(TOOLCHAIN_ARM_MICRO)
2222
#define STACK_SIZE 768

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ typedef struct {
2424
#define STACK_SIZE DEFAULT_STACK_SIZE/2
2525
#elif (defined(TARGET_STM32F030R8)) && defined(TOOLCHAIN_IAR)
2626
#define STACK_SIZE DEFAULT_STACK_SIZE/2
27-
#elif (defined(TARGET_EFM32ZG_STK3200) || defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
27+
#elif (defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
2828
#define STACK_SIZE 512
2929
#elif (defined(TARGET_EFM32LG_STK3600) || defined(TARGET_EFM32WG_STK3800) || defined(TARGET_EFM32PG_STK3401)) && !defined(TOOLCHAIN_ARM_MICRO)
3030
#define STACK_SIZE 768

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#define STACK_SIZE DEFAULT_STACK_SIZE/2
2727
#elif defined(TARGET_STM32F303K8) && defined(TOOLCHAIN_IAR)
2828
#define STACK_SIZE DEFAULT_STACK_SIZE/2
29-
#elif (defined(TARGET_EFM32ZG_STK3200) || defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
29+
#elif (defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
3030
#define STACK_SIZE 512
3131
#elif (defined(TARGET_EFM32LG_STK3600) || defined(TARGET_EFM32WG_STK3800) || defined(TARGET_EFM32PG_STK3401)) && !defined(TOOLCHAIN_ARM_MICRO)
3232
#define STACK_SIZE 768

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ typedef struct {
2424
#define STACK_SIZE DEFAULT_STACK_SIZE/4
2525
#elif (defined(TARGET_STM32F030R8)) && defined(TOOLCHAIN_IAR)
2626
#define STACK_SIZE DEFAULT_STACK_SIZE/2
27-
#elif (defined(TARGET_EFM32ZG_STK3200) || defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
27+
#elif (defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
2828
#define STACK_SIZE 512
2929
#elif (defined(TARGET_EFM32LG_STK3600) || defined(TARGET_EFM32WG_STK3800) || defined(TARGET_EFM32PG_STK3401)) && !defined(TOOLCHAIN_ARM_MICRO)
3030
#define STACK_SIZE 768

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#define STACK_SIZE DEFAULT_STACK_SIZE/2
3030
#elif defined(TARGET_STM32F303K8) && defined(TOOLCHAIN_IAR)
3131
#define STACK_SIZE DEFAULT_STACK_SIZE/4
32-
#elif (defined(TARGET_EFM32ZG_STK3200) || defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
32+
#elif (defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
3333
#define STACK_SIZE 512
3434
#elif (defined(TARGET_EFM32LG_STK3600) || defined(TARGET_EFM32WG_STK3800) || defined(TARGET_EFM32PG_STK3401)) && !defined(TOOLCHAIN_ARM_MICRO)
3535
#define STACK_SIZE 768

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define STACK_SIZE DEFAULT_STACK_SIZE/4
1616
#elif (defined(TARGET_STM32F030R8)) && defined(TOOLCHAIN_IAR)
1717
#define STACK_SIZE DEFAULT_STACK_SIZE/2
18-
#elif (defined(TARGET_EFM32ZG_STK3200) || defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
18+
#elif (defined(TARGET_EFM32HG_STK3400)) && !defined(TOOLCHAIN_ARM_MICRO)
1919
#define STACK_SIZE 512
2020
#elif (defined(TARGET_EFM32LG_STK3600) || defined(TARGET_EFM32WG_STK3800) || defined(TARGET_EFM32PG_STK3401)) && !defined(TOOLCHAIN_ARM_MICRO)
2121
#define STACK_SIZE 768

‎rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,6 @@ osThreadDef_t os_thread_def_main = {(os_pthread)pre_main, osPriorityNormal, 1U,
500500
#elif defined(TARGET_EFM32LG_STK3600) || defined(TARGET_EFM32WG_STK3800) || defined(TARGET_EFM32PG_STK3401)
501501
#define INITIAL_SP (0x20008000UL)
502502

503-
#elif defined(TARGET_EFM32ZG_STK3200)
504-
#define INITIAL_SP (0x20001000UL)
505503
#else
506504
#error "no target defined"
507505

‎rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
|| defined(TARGET_STM32F103RB) || defined(TARGET_LPC824) || defined(TARGET_STM32F302R8) || defined(TARGET_STM32F334R8) || defined(TARGET_STM32F334C8) \
6060
|| defined(TARGET_STM32L031K6) || defined(TARGET_STM32L053R8) || defined(TARGET_STM32L053C8) || defined(TARGET_STM32L073RZ) || defined(TARGET_STM32F072RB) || defined(TARGET_STM32F091RC) || defined(TARGET_NZ32_SC151) \
6161
|| defined(TARGET_SSCI824) || defined(TARGET_STM32F030R8) || defined(TARGET_STM32F070RB) \
62-
|| defined(TARGET_EFM32HG_STK3400) || defined(TARGET_EFM32ZG_STK3200)
62+
|| defined(TARGET_EFM32HG_STK3400)
6363
# define OS_TASKCNT 6
6464
# else
6565
# error "no target defined"
@@ -97,7 +97,7 @@
9797
# define OS_MAINSTKSIZE 128
9898
# elif defined(TARGET_STM32F334R8) || defined(TARGET_STM32F303RE) || defined(TARGET_STM32F303K8) || defined(TARGET_STM32F334C8) \
9999
|| defined(TARGET_STM32L031K6) || defined(TARGET_STM32L053R8) || defined(TARGET_STM32L053C8) || defined(TARGET_STM32L073RZ) \
100-
|| defined(TARGET_EFM32HG_STK3400) || defined(TARGET_EFM32ZG_STK3200)
100+
|| defined(TARGET_EFM32HG_STK3400)
101101
# define OS_MAINSTKSIZE 112
102102
# else
103103
# error "no target defined"

‎workspace_tools/build_travis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
{ "target": "NRF51_DK", "toolchains": "GCC_ARM", "libs": ["dsp", "fat"] },
9898
{ "target": "NRF51_MICROBIT", "toolchains": "GCC_ARM", "libs": ["dsp", "fat"] },
9999

100-
{ "target": "EFM32ZG_STK3200", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] },
100+
{ "target": "EFM32ZG_STK3200", "toolchains": "GCC_ARM", "libs": ["dsp"] },
101101
{ "target": "EFM32HG_STK3400", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
102102
{ "target": "EFM32LG_STK3600", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
103103
{ "target": "EFM32GG_STK3700", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },

0 commit comments

Comments
 (0)