Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Silabs]Remove all references of EFR32MG12 #34019

Merged
merged 6 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
name: EFR32

env:
SILABS_BOARD: BRD4161A
SILABS_BOARD: BRD4187C
BUILD_TYPE: gn_efr32

runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ jobs:
efr32:
name: EFR32
env:
SILABS_BOARD: BRD4161A
BUILD_DIRECTORY: out/lock_app_debug/BRD4161A
SILABS_BOARD: BRD4187C
BUILD_DIRECTORY: out/lock_app_debug/BRD4187C

runs-on: ubuntu-latest

Expand Down
60 changes: 12 additions & 48 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -557,54 +557,18 @@
"bouffalolab-xt-zb6-devkit-light",
"bouffalolab-xt-zb6-devkit-light-rpc-115200",
"bouffalolab-bl706-night-light-light",
"efr32-brd4161a-light",
"efr32-brd4163a-light",
"efr32-brd4164a-light",
"efr32-brd4166a-light",
"efr32-brd4170a-light",
"efr32-brd4186a-light",
"efr32-brd4187a-light",
"efr32-brd4304a-light",
"efr32-brd4161a-light-rpc",
"efr32-brd4163a-light-rpc",
"efr32-brd4164a-light-rpc",
"efr32-brd4166a-light-rpc",
"efr32-brd4170a-light-rpc",
"efr32-brd4186a-light-rpc",
"efr32-brd4187a-light-rpc",
"efr32-brd4304a-light-rpc",
"efr32-brd4161a-lock",
"efr32-brd4163a-lock",
"efr32-brd4164a-lock",
"efr32-brd4166a-lock",
"efr32-brd4170a-lock",
"efr32-brd4186a-lock",
"efr32-brd4187a-lock",
"efr32-brd4304a-lock",
"efr32-brd4161a-unit-test",
"efr32-brd4163a-unit-test",
"efr32-brd4164a-unit-test",
"efr32-brd4166a-unit-test",
"efr32-brd4170a-unit-test",
"efr32-brd4186a-unit-test",
"efr32-brd4187a-unit-test",
"efr32-brd4304a-unit-test",
"efr32-brd4161a-switch",
"efr32-brd4163a-switch",
"efr32-brd4164a-switch",
"efr32-brd4166a-switch",
"efr32-brd4170a-switch",
"efr32-brd4186a-switch",
"efr32-brd4187a-switch",
"efr32-brd4304a-switch",
"efr32-brd4161a-window-covering",
"efr32-brd4163a-window-covering",
"efr32-brd4164a-window-covering",
"efr32-brd4166a-window-covering",
"efr32-brd4170a-window-covering",
"efr32-brd4186a-window-covering",
"efr32-brd4187a-window-covering",
"efr32-brd4304a-window-covering",
"efr32-brd4186c-light",
"efr32-brd4186c-light-rpc",
"efr32-brd4186c-lock",
"efr32-brd4186c-unit-test",
"efr32-brd4186c-switch",
"efr32-brd4186c-window-covering",
"efr32-brd4187c-light",
"efr32-brd4187c-light-rpc",
"efr32-brd4187c-lock",
"efr32-brd4187c-unit-test",
"efr32-brd4187c-switch",
"efr32-brd4187c-window-covering",
"efr32-brd4338a-light-wifi-917_soc-skip_rps_generation",
"esp32-c3devkit-all-clusters",
"esp32-devkitc-all-clusters",
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/sample_app_util/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ The list of platforms supported here (as of writing this) are:

```
m5stack
brd4161a
brd4187c
nrf52840dk
linux_x86
```
Expand All @@ -105,7 +105,7 @@ For example, here are some valid names:

```
m5stack_rootnode_humiditysensor_pv0comNKyT
brd4161a_rootnode_humiditysensor_pv0comNKyT
brd4187c_rootnode_humiditysensor_pv0comNKyT
nrf52840dk_rootnode_humiditysensor_pv0comNKyT
linux_x86_rootnode_humiditysensor_pv0comNKyT
```
Expand Down
28 changes: 3 additions & 25 deletions examples/light-switch-app/silabs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Matter EFR32 Light Switch Example

An example showing the use of CHIP on the Silicon Labs EFR32 MG12 and MG24.
An example showing the use of CHIP on the Silicon Labs EFR32 MG24.

<hr>

Expand Down Expand Up @@ -79,22 +79,6 @@ Silicon Labs platform.
> [Hardware Requirements](https://github.com/SiliconLabs/matter/blob/latest/docs/silabs/general/HARDWARE_REQUIREMENTS.md)
> in the Silicon Labs Matter Github Repo

MG12 boards:

- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
868MHz@19dBm
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
915MHz@19dBm
- BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm

MG21 boards: Currently not supported due to RAM limitation.

- BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

MG24 boards :

- BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
Expand Down Expand Up @@ -212,17 +196,11 @@ combination with JLinkRTTClient as follows:

- Run the JLinkExe tool with arguments to autoconnect to the WSTK board:

For MG12 use:

$ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1

For MG21 use:

$ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1

For MG24 use:

```
$ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
```

- In a second terminal, run the JLinkRTTClient to view logs:

Expand Down
28 changes: 5 additions & 23 deletions examples/lighting-app/silabs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Matter EFR32 Lighting Example

An example showing the use of CHIP on the Silicon Labs EFR32 MG12 and MG24.
An example showing the use of CHIP on the Silicon Labs EFR32 MG24.

<hr>

Expand Down Expand Up @@ -73,22 +73,6 @@ Silicon Labs platform.
> [Hardware Requirements](https://github.com/SiliconLabs/matter/blob/latest/docs/silabs/general/HARDWARE_REQUIREMENTS.md)
> in the Silicon Labs Matter Github Repo

MG12 boards:

- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
868MHz@19dBm
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
915MHz@19dBm
- BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm

MG21 boards: Currently not supported due to RAM limitation.

- BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

MG24 boards :

- BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
Expand Down Expand Up @@ -202,13 +186,11 @@ combination with JLinkRTTClient as follows:

- Run the JLinkExe tool with arguments to autoconnect to the WSTK board:

For MG12 use:

$ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1

For MG21 use:
For MG24 use:

$ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1
```
$ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
```

- In a second terminal, run the JLinkRTTClient to view logs:

Expand Down
30 changes: 4 additions & 26 deletions examples/lit-icd-app/silabs/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Matter EFR32 Lit ICD Example

An example showing the use of CHIP on the Silicon Labs EFR32 MG12 and MG24.
An example showing the use of CHIP on the Silicon Labs EFR32 MG24.

<hr>

- [Matter EFR32 LIT ICD Example](#matter-efr32-lit-icd-example)
- [Matter EFR32 Lit ICD Example](#matter-efr32-lit-icd-example)
- [Introduction](#introduction)
- [Building](#building)
- [Linux](#linux)
Expand Down Expand Up @@ -79,22 +79,6 @@ Labs platform.
> [Hardware Requirements](https://github.com/SiliconLabs/matter/blob/latest/docs/silabs/general/HARDWARE_REQUIREMENTS.md)
> in the Silicon Labs Matter Github Repo

MG12 boards:

- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
868MHz@19dBm
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
915MHz@19dBm
- BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm

MG21 boards: Currently not supported due to RAM limitation.

- BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

MG24 boards :

- BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
Expand Down Expand Up @@ -204,17 +188,11 @@ combination with JLinkRTTClient as follows:

- Run the JLinkExe tool with arguments to autoconnect to the WSTK board:

For MG12 use:

$ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1

For MG21 use:

$ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1

For MG24 use:

```
$ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
```

- In a second terminal, run the JLinkRTTClient to view logs:

Expand Down
28 changes: 3 additions & 25 deletions examples/lock-app/silabs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Matter EFR32 Lock Example

An example showing the use of CHIP on the Silicon Labs EFR32 MG12 and MG24.
An example showing the use of CHIP on the Silicon Labs EFR32 MG24.

<hr>

Expand Down Expand Up @@ -74,22 +74,6 @@ Mac OS X
> [Hardware Requirements](https://github.com/SiliconLabs/matter/blob/latest/docs/silabs/general/HARDWARE_REQUIREMENTS.md)
> in the Silicon Labs Matter Github Repo

MG12 boards:

- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
868MHz@19dBm
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
915MHz@19dBm
- BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm

MG21 boards: Currently not supported due to RAM limitation.

- BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm

MG24 boards :

- BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
Expand Down Expand Up @@ -223,16 +207,10 @@ combination with JLinkRTTClient as follows:

- Run the JLinkExe tool with arguments to autoconnect to the WSTK board:

For MG12 use:

```
$ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1
```

For MG21 use:
For MG24 use:

```
$ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1
$ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
```

- In a second terminal, run the JLinkRTTClient to view logs:
Expand Down
8 changes: 2 additions & 6 deletions examples/platform/silabs/efr32/rs911x/hal/efx_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,7 @@
#include "sl_mx25_flash_shutdown_usart_config.h"
#endif // SL_MX25CTRL_MUX

#if defined(EFR32MG12)
#include "em_usart.h"
#include "sl_spidrv_exp_config.h"
#define SL_SPIDRV_HANDLE sl_spidrv_exp_handle
#elif defined(EFR32MG24)
#if defined(EFR32MG24)
#include "em_eusart.h"
#include "sl_spidrv_eusart_exp_config.h"
#include "spi_multiplex.h"
Expand Down Expand Up @@ -183,7 +179,7 @@ void rsi_hal_board_init(void)
xSemaphoreGive(spi_sem_sync_hdl);
#endif /* SL_SPICTRL_MUX */

/* GPIO INIT of MG12 & MG24 : Reset, Wakeup, Interrupt */
/* GPIO INIT of MG24 : Reset, Wakeup, Interrupt */
sl_wfx_host_gpio_init();

/* Reset of Wifi chip */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,12 @@ typedef struct
.port = gpioPort##port_id, .pin = pin_id \
}

#if defined(EFR32MG12_BRD4161A) || defined(BRD4161A) || defined(EFR32MG12_BRD4162A) || defined(BRD4162A) || \
defined(EFR32MG12_BRD4163A) || defined(BRD4163A) || defined(EFR32MG12_BRD4164A) || defined(BRD4164A) || \
defined(EFR32MG12_BRD4170A) || defined(BRD4170A)
// BRD4161-63-64 are pin to pin compatible for SPI
#include "brd4161a.h"
#elif defined(EFR32MG24_BRD4186C) || defined(BRD4186C)
#if defined(EFR32MG24_BRD4186C) || defined(BRD4186C)
#include "brd4186c.h"
#elif defined(EFR32MG24_BRD4187C) || defined(BRD4187C)
#include "brd4187c.h"
#else
#error "Need SPI Pins"
#endif /* EFR32MG12_BRD4161A */
#endif /* EFR32MG24_BRD4186C */

#endif /* _RSI_BOARD_CONFIGURATION_H_ */
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@ typedef struct
}

#define PACKET_PENDING_INT_PRI 3
#if defined(EFR32MG12_BRD4161A) || defined(BRD4161A) || defined(EFR32MG12_BRD4162A) || defined(BRD4162A) || \
defined(EFR32MG12_BRD4163A) || defined(BRD4163A) || defined(EFR32MG12_BRD4164A) || defined(BRD4164A) || \
defined(EFR32MG12_BRD4170A) || defined(BRD4170A)
// BRD4161-63-64 are pin to pin compatible for SPI
#include "brd4161a.h"
#elif defined(EFR32MG24_BRD4186C) || defined(BRD4186C)
#if defined(EFR32MG24_BRD4186C) || defined(BRD4186C)
#include "brd4186c.h"
#elif defined(EFR32MG24_BRD4187C) || defined(BRD4187C)
#include "brd4187c.h"
Expand All @@ -48,4 +43,4 @@ typedef struct
#define INTERRUPT_PIN PIN(A, 7)
#define SLEEP_CONFIRM_PIN PIN(A, 5) /* Exp hdr 7 */
#endif
#endif /* _RSI_BOARD_CONFIGURATION_H_ */
#endif /* _RSI_BOARD_CONFIGURATION_H_ */
9 changes: 0 additions & 9 deletions examples/platform/silabs/efr32/wf200/efr_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,7 @@ static uint32_t dummy_rx_data;
static uint32_t dummy_tx_data;
static bool spi_enabled = false;

#if defined(EFR32MG12)
uint8_t wirq_irq_nb = SL_WFX_HOST_PINOUT_SPI_IRQ;
#elif defined(EFR32MG24)
uint8_t wirq_irq_nb = SL_WFX_HOST_PINOUT_SPI_WIRQ_PIN; // SL_WFX_HOST_PINOUT_SPI_WIRQ_PIN;
#endif

#define PIN_OUT_SET 1
#define PIN_OUT_CLEAR 0
Expand All @@ -102,11 +98,6 @@ sl_status_t sl_wfx_host_init_bus(void)
* EUSARTROUTE register to do this.
*/

#if defined(EFR32MG12)
MY_USART->CTRL |= (1u << _USART_CTRL_SMSDELAY_SHIFT);
MY_USART->ROUTEPEN = USART_ROUTEPEN_TXPEN | USART_ROUTEPEN_RXPEN | USART_ROUTEPEN_CLKPEN;
#endif

#if defined(EFR32MG24)
GPIO->USARTROUTE[0].ROUTEEN = GPIO_USART_ROUTEEN_RXPEN | // MISO
GPIO_USART_ROUTEEN_TXPEN | // MOSI
Expand Down
Loading
Loading