Skip to content

Commit 4df6986

Browse files
committed
[EFM32] Use targets.json to improve directory structure
Now that we have targets.json, we get target inheritance and can use it to clean up the EFM32 folder structure. * In the top-level EFM32 folder, there are now folders per MCU family (Giant, Leopard, ...) * Those family folders contain the CMSIS headers in the 'device' subfolder, as well as global family headers (i.e. mapping of pins to peripherals) * Inside of the family folder, there is a per-target folder containing target settings. In the future, we'll want to get rid of those by using the config system provided by targets.json
1 parent 6574f4d commit 4df6986

File tree

370 files changed

+115
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

370 files changed

+115
-57
lines changed

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG_STK3700/PeripheralNames.h renamed to targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ typedef enum {
6060
LEUART_1 = LEUART1_BASE
6161
} UARTName;
6262

63-
#define STDIO_UART_TX USBTX
64-
#define STDIO_UART_RX USBRX
65-
#define STDIO_UART UART0
66-
6763
typedef enum {
6864
SPI_0 = USART0_BASE,
6965
SPI_1 = USART1_BASE,

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32WG_STK3800/PinNames.h renamed to targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG/TARGET_EFM32GG_STK3700/PinNames.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ typedef enum {
5050
SERIAL_RX = PD1,
5151
USBTX = PE0,
5252
USBRX = PE1,
53-
EFM_BC_EN = PF7
53+
54+
/* Board Controller */
55+
STDIO_UART_TX = USBTX,
56+
STDIO_UART_RX = USBRX,
57+
EFM_BC_EN = PF7
5458
} PinName;
5559

5660
#ifdef __cplusplus

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/device_peripherals.h renamed to targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG/TARGET_EFM32GG_STK3700/device_peripherals.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
/* USB */
3737
#define USB_TIMER USB_TIMER1
3838

39+
/* STDIO */
40+
#define STDIO_UART UART0
41+
3942
/* Clocks */
4043

4144
/* Clock definitions */

0 commit comments

Comments
 (0)