Skip to content

Commit 6574f4d

Browse files
committed
[EFM32] Clean up per-target Modules.h
Removed deprecated defines MODULES_SIZE_* and moved the setting for the SPI asynch transfer queue size to targets.json, where it apparently belongs
1 parent b766c48 commit 6574f4d

File tree

8 files changed

+18
-216
lines changed

8 files changed

+18
-216
lines changed

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG_STK3700/Modules.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32HG_STK3400/Modules.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/Modules.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32PG_STK3401/Modules.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32WG_STK3800/Modules.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32ZG_STK3200/Modules.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

targets/TARGET_Silicon_Labs/TARGET_EFM32/serial_api.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,18 @@
6161
#error Undefined number of low energy UARTs (LEUART).
6262
#endif
6363

64+
#ifndef UART_PRESENT
65+
#define UART_COUNT (0)
66+
#endif
67+
#ifndef USART_PRESENT
68+
#define USART_COUNT (0)
69+
#endif
70+
#ifndef LEUART_PRESENT
71+
#define LEUART_COUNT (0)
72+
#endif
73+
74+
#define MODULES_SIZE_SERIAL (UART_COUNT + USART_COUNT + LEUART_COUNT)
75+
6476
/* Store IRQ id for each UART */
6577
static uint32_t serial_irq_ids[MODULES_SIZE_SERIAL] = { 0 };
6678
/* Interrupt handler from mbed common */

targets/targets.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1818,7 +1818,7 @@
18181818
"EFM32GG_STK3700": {
18191819
"inherits": ["Target"],
18201820
"core": "Cortex-M3",
1821-
"macros": ["EFM32GG990F1024"],
1821+
"macros": ["EFM32GG990F1024", "TRANSACTION_QUEUE_SIZE_SPI=4"],
18221822
"extra_labels": ["Silicon_Labs", "EFM32"],
18231823
"supported_toolchains": ["GCC_ARM", "ARM", "uARM", "IAR"],
18241824
"progen": {"target": "efm32gg-stk"},
@@ -1830,7 +1830,7 @@
18301830
"EFM32LG_STK3600": {
18311831
"inherits": ["Target"],
18321832
"core": "Cortex-M3",
1833-
"macros": ["EFM32LG990F256"],
1833+
"macros": ["EFM32LG990F256", "TRANSACTION_QUEUE_SIZE_SPI=4"],
18341834
"extra_labels": ["Silicon_Labs", "EFM32"],
18351835
"supported_toolchains": ["GCC_ARM", "ARM", "uARM", "IAR"],
18361836
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
@@ -1841,7 +1841,7 @@
18411841
"EFM32WG_STK3800": {
18421842
"inherits": ["Target"],
18431843
"core": "Cortex-M4F",
1844-
"macros": ["EFM32WG990F256"],
1844+
"macros": ["EFM32WG990F256", "TRANSACTION_QUEUE_SIZE_SPI=4"],
18451845
"extra_labels": ["Silicon_Labs", "EFM32"],
18461846
"supported_toolchains": ["GCC_ARM", "ARM", "uARM", "IAR"],
18471847
"progen": {"target": "efm32wg-stk"},
@@ -1856,7 +1856,7 @@
18561856
"default_toolchain": "uARM",
18571857
"supported_toolchains": ["GCC_ARM", "uARM", "IAR"],
18581858
"extra_labels": ["Silicon_Labs", "EFM32"],
1859-
"macros": ["EFM32ZG222F32"],
1859+
"macros": ["EFM32ZG222F32", "TRANSACTION_QUEUE_SIZE_SPI=0"],
18601860
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
18611861
"default_lib": "small",
18621862
"forced_reset_timeout": 2,
@@ -1869,7 +1869,7 @@
18691869
"default_toolchain": "uARM",
18701870
"supported_toolchains": ["GCC_ARM", "uARM", "IAR"],
18711871
"extra_labels": ["Silicon_Labs", "EFM32"],
1872-
"macros": ["EFM32HG322F64"],
1872+
"macros": ["EFM32HG322F64", "TRANSACTION_QUEUE_SIZE_SPI=0"],
18731873
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
18741874
"default_lib": "small",
18751875
"forced_reset_timeout": 2,
@@ -1879,7 +1879,7 @@
18791879
"EFM32PG_STK3401": {
18801880
"inherits": ["Target"],
18811881
"core": "Cortex-M4F",
1882-
"macros": ["EFM32PG1B200F256GM48"],
1882+
"macros": ["EFM32PG1B200F256GM48", "TRANSACTION_QUEUE_SIZE_SPI=4"],
18831883
"extra_labels": ["Silicon_Labs", "EFM32"],
18841884
"supported_toolchains": ["GCC_ARM", "ARM", "uARM", "IAR"],
18851885
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],

0 commit comments

Comments
 (0)