Skip to content

Commit 3f59179

Browse files
jmartinez-silabsrestyled-commits
jmartinez-silabs
and
restyled-commits
authored
[Silabs]Remove all references of EFR32MG12 (#34019)
* Remove all references of EFR32MG12 * Restyled by prettier-markdown * rename testdata/dry_run_efr32 text file to match board used * Fix up casing in board argument * Fix board list order * keep cortext m4 settings for 917 soc --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent c4f863e commit 3f59179

File tree

33 files changed

+114
-1021
lines changed

33 files changed

+114
-1021
lines changed

‎.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
name: EFR32
3434

3535
env:
36-
SILABS_BOARD: BRD4161A
36+
SILABS_BOARD: BRD4187C
3737
BUILD_TYPE: gn_efr32
3838

3939
runs-on: ubuntu-latest

‎.github/workflows/release_artifacts.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858
efr32:
5959
name: EFR32
6060
env:
61-
SILABS_BOARD: BRD4161A
62-
BUILD_DIRECTORY: out/lock_app_debug/BRD4161A
61+
SILABS_BOARD: BRD4187C
62+
BUILD_DIRECTORY: out/lock_app_debug/BRD4187C
6363

6464
runs-on: ubuntu-latest
6565

‎.vscode/tasks.json

+12-48
Original file line numberDiff line numberDiff line change
@@ -557,54 +557,18 @@
557557
"bouffalolab-xt-zb6-devkit-light",
558558
"bouffalolab-xt-zb6-devkit-light-rpc-115200",
559559
"bouffalolab-bl706-night-light-light",
560-
"efr32-brd4161a-light",
561-
"efr32-brd4163a-light",
562-
"efr32-brd4164a-light",
563-
"efr32-brd4166a-light",
564-
"efr32-brd4170a-light",
565-
"efr32-brd4186a-light",
566-
"efr32-brd4187a-light",
567-
"efr32-brd4304a-light",
568-
"efr32-brd4161a-light-rpc",
569-
"efr32-brd4163a-light-rpc",
570-
"efr32-brd4164a-light-rpc",
571-
"efr32-brd4166a-light-rpc",
572-
"efr32-brd4170a-light-rpc",
573-
"efr32-brd4186a-light-rpc",
574-
"efr32-brd4187a-light-rpc",
575-
"efr32-brd4304a-light-rpc",
576-
"efr32-brd4161a-lock",
577-
"efr32-brd4163a-lock",
578-
"efr32-brd4164a-lock",
579-
"efr32-brd4166a-lock",
580-
"efr32-brd4170a-lock",
581-
"efr32-brd4186a-lock",
582-
"efr32-brd4187a-lock",
583-
"efr32-brd4304a-lock",
584-
"efr32-brd4161a-unit-test",
585-
"efr32-brd4163a-unit-test",
586-
"efr32-brd4164a-unit-test",
587-
"efr32-brd4166a-unit-test",
588-
"efr32-brd4170a-unit-test",
589-
"efr32-brd4186a-unit-test",
590-
"efr32-brd4187a-unit-test",
591-
"efr32-brd4304a-unit-test",
592-
"efr32-brd4161a-switch",
593-
"efr32-brd4163a-switch",
594-
"efr32-brd4164a-switch",
595-
"efr32-brd4166a-switch",
596-
"efr32-brd4170a-switch",
597-
"efr32-brd4186a-switch",
598-
"efr32-brd4187a-switch",
599-
"efr32-brd4304a-switch",
600-
"efr32-brd4161a-window-covering",
601-
"efr32-brd4163a-window-covering",
602-
"efr32-brd4164a-window-covering",
603-
"efr32-brd4166a-window-covering",
604-
"efr32-brd4170a-window-covering",
605-
"efr32-brd4186a-window-covering",
606-
"efr32-brd4187a-window-covering",
607-
"efr32-brd4304a-window-covering",
560+
"efr32-brd4186c-light",
561+
"efr32-brd4186c-light-rpc",
562+
"efr32-brd4186c-lock",
563+
"efr32-brd4186c-unit-test",
564+
"efr32-brd4186c-switch",
565+
"efr32-brd4186c-window-covering",
566+
"efr32-brd4187c-light",
567+
"efr32-brd4187c-light-rpc",
568+
"efr32-brd4187c-lock",
569+
"efr32-brd4187c-unit-test",
570+
"efr32-brd4187c-switch",
571+
"efr32-brd4187c-window-covering",
608572
"efr32-brd4338a-light-wifi-917_soc-skip_rps_generation",
609573
"esp32-c3devkit-all-clusters",
610574
"esp32-devkitc-all-clusters",

‎examples/chef/sample_app_util/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ The list of platforms supported here (as of writing this) are:
9696

9797
```
9898
m5stack
99-
brd4161a
99+
brd4187c
100100
nrf52840dk
101101
linux_x86
102102
```
@@ -105,7 +105,7 @@ For example, here are some valid names:
105105

106106
```
107107
m5stack_rootnode_humiditysensor_pv0comNKyT
108-
brd4161a_rootnode_humiditysensor_pv0comNKyT
108+
brd4187c_rootnode_humiditysensor_pv0comNKyT
109109
nrf52840dk_rootnode_humiditysensor_pv0comNKyT
110110
linux_x86_rootnode_humiditysensor_pv0comNKyT
111111
```

‎examples/light-switch-app/silabs/README.md

+3-25
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Matter EFR32 Light Switch Example
22

3-
An example showing the use of CHIP on the Silicon Labs EFR32 MG12 and MG24.
3+
An example showing the use of CHIP on the Silicon Labs EFR32 MG24.
44

55
<hr>
66

@@ -79,22 +79,6 @@ Silicon Labs platform.
7979
> [Hardware Requirements](https://github.com/SiliconLabs/matter/blob/latest/docs/silabs/general/HARDWARE_REQUIREMENTS.md)
8080
> in the Silicon Labs Matter Github Repo
8181
82-
MG12 boards:
83-
84-
- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
85-
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
86-
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
87-
868MHz@19dBm
88-
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
89-
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
90-
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
91-
915MHz@19dBm
92-
- BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
93-
94-
MG21 boards: Currently not supported due to RAM limitation.
95-
96-
- BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
97-
9882
MG24 boards :
9983

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

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

215-
For MG12 use:
216-
217-
$ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1
218-
219-
For MG21 use:
220-
221-
$ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1
222-
223199
For MG24 use:
224200

201+
```
225202
$ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
203+
```
226204

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

‎examples/lighting-app/silabs/README.md

+5-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Matter EFR32 Lighting Example
22

3-
An example showing the use of CHIP on the Silicon Labs EFR32 MG12 and MG24.
3+
An example showing the use of CHIP on the Silicon Labs EFR32 MG24.
44

55
<hr>
66

@@ -73,22 +73,6 @@ Silicon Labs platform.
7373
> [Hardware Requirements](https://github.com/SiliconLabs/matter/blob/latest/docs/silabs/general/HARDWARE_REQUIREMENTS.md)
7474
> in the Silicon Labs Matter Github Repo
7575
76-
MG12 boards:
77-
78-
- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
79-
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
80-
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
81-
868MHz@19dBm
82-
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
83-
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
84-
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
85-
915MHz@19dBm
86-
- BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
87-
88-
MG21 boards: Currently not supported due to RAM limitation.
89-
90-
- BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
91-
9276
MG24 boards :
9377

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

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

205-
For MG12 use:
206-
207-
$ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1
208-
209-
For MG21 use:
189+
For MG24 use:
210190

211-
$ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1
191+
```
192+
$ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
193+
```
212194

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

‎examples/lit-icd-app/silabs/README.md

+4-26
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Matter EFR32 Lit ICD Example
22

3-
An example showing the use of CHIP on the Silicon Labs EFR32 MG12 and MG24.
3+
An example showing the use of CHIP on the Silicon Labs EFR32 MG24.
44

55
<hr>
66

7-
- [Matter EFR32 LIT ICD Example](#matter-efr32-lit-icd-example)
7+
- [Matter EFR32 Lit ICD Example](#matter-efr32-lit-icd-example)
88
- [Introduction](#introduction)
99
- [Building](#building)
1010
- [Linux](#linux)
@@ -79,22 +79,6 @@ Labs platform.
7979
> [Hardware Requirements](https://github.com/SiliconLabs/matter/blob/latest/docs/silabs/general/HARDWARE_REQUIREMENTS.md)
8080
> in the Silicon Labs Matter Github Repo
8181
82-
MG12 boards:
83-
84-
- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
85-
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
86-
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
87-
868MHz@19dBm
88-
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
89-
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
90-
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
91-
915MHz@19dBm
92-
- BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
93-
94-
MG21 boards: Currently not supported due to RAM limitation.
95-
96-
- BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
97-
9882
MG24 boards :
9983

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

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

207-
For MG12 use:
208-
209-
$ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1
210-
211-
For MG21 use:
212-
213-
$ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1
214-
215191
For MG24 use:
216192

193+
```
217194
$ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
195+
```
218196

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

‎examples/lock-app/silabs/README.md

+3-25
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Matter EFR32 Lock Example
22

3-
An example showing the use of CHIP on the Silicon Labs EFR32 MG12 and MG24.
3+
An example showing the use of CHIP on the Silicon Labs EFR32 MG24.
44

55
<hr>
66

@@ -74,22 +74,6 @@ Mac OS X
7474
> [Hardware Requirements](https://github.com/SiliconLabs/matter/blob/latest/docs/silabs/general/HARDWARE_REQUIREMENTS.md)
7575
> in the Silicon Labs Matter Github Repo
7676
77-
MG12 boards:
78-
79-
- BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
80-
- BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
81-
- BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
82-
868MHz@19dBm
83-
- BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
84-
- BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
85-
- BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
86-
915MHz@19dBm
87-
- BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
88-
89-
MG21 boards: Currently not supported due to RAM limitation.
90-
91-
- BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
92-
9377
MG24 boards :
9478

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

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

226-
For MG12 use:
227-
228-
```
229-
$ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1
230-
```
231-
232-
For MG21 use:
210+
For MG24 use:
233211

234212
```
235-
$ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1
213+
$ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
236214
```
237215

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

‎examples/platform/silabs/efr32/rs911x/hal/efx_spi.c

+2-6
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,7 @@
6565
#include "sl_mx25_flash_shutdown_usart_config.h"
6666
#endif // SL_MX25CTRL_MUX
6767

68-
#if defined(EFR32MG12)
69-
#include "em_usart.h"
70-
#include "sl_spidrv_exp_config.h"
71-
#define SL_SPIDRV_HANDLE sl_spidrv_exp_handle
72-
#elif defined(EFR32MG24)
68+
#if defined(EFR32MG24)
7369
#include "em_eusart.h"
7470
#include "sl_spidrv_eusart_exp_config.h"
7571
#include "spi_multiplex.h"
@@ -183,7 +179,7 @@ void rsi_hal_board_init(void)
183179
xSemaphoreGive(spi_sem_sync_hdl);
184180
#endif /* SL_SPICTRL_MUX */
185181

186-
/* GPIO INIT of MG12 & MG24 : Reset, Wakeup, Interrupt */
182+
/* GPIO INIT of MG24 : Reset, Wakeup, Interrupt */
187183
sl_wfx_host_gpio_init();
188184

189185
/* Reset of Wifi chip */

‎examples/platform/silabs/efr32/rs911x/hal/rsi_board_configuration.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,12 @@ typedef struct
3030
.port = gpioPort##port_id, .pin = pin_id \
3131
}
3232

33-
#if defined(EFR32MG12_BRD4161A) || defined(BRD4161A) || defined(EFR32MG12_BRD4162A) || defined(BRD4162A) || \
34-
defined(EFR32MG12_BRD4163A) || defined(BRD4163A) || defined(EFR32MG12_BRD4164A) || defined(BRD4164A) || \
35-
defined(EFR32MG12_BRD4170A) || defined(BRD4170A)
36-
// BRD4161-63-64 are pin to pin compatible for SPI
37-
#include "brd4161a.h"
38-
#elif defined(EFR32MG24_BRD4186C) || defined(BRD4186C)
33+
#if defined(EFR32MG24_BRD4186C) || defined(BRD4186C)
3934
#include "brd4186c.h"
4035
#elif defined(EFR32MG24_BRD4187C) || defined(BRD4187C)
4136
#include "brd4187c.h"
4237
#else
4338
#error "Need SPI Pins"
44-
#endif /* EFR32MG12_BRD4161A */
39+
#endif /* EFR32MG24_BRD4186C */
4540

4641
#endif /* _RSI_BOARD_CONFIGURATION_H_ */

‎examples/platform/silabs/efr32/rs911x/hal/sl_board_configuration.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ typedef struct
3131
}
3232

3333
#define PACKET_PENDING_INT_PRI 3
34-
#if defined(EFR32MG12_BRD4161A) || defined(BRD4161A) || defined(EFR32MG12_BRD4162A) || defined(BRD4162A) || \
35-
defined(EFR32MG12_BRD4163A) || defined(BRD4163A) || defined(EFR32MG12_BRD4164A) || defined(BRD4164A) || \
36-
defined(EFR32MG12_BRD4170A) || defined(BRD4170A)
37-
// BRD4161-63-64 are pin to pin compatible for SPI
38-
#include "brd4161a.h"
39-
#elif defined(EFR32MG24_BRD4186C) || defined(BRD4186C)
34+
#if defined(EFR32MG24_BRD4186C) || defined(BRD4186C)
4035
#include "brd4186c.h"
4136
#elif defined(EFR32MG24_BRD4187C) || defined(BRD4187C)
4237
#include "brd4187c.h"
@@ -48,4 +43,4 @@ typedef struct
4843
#define INTERRUPT_PIN PIN(A, 7)
4944
#define SLEEP_CONFIRM_PIN PIN(A, 5) /* Exp hdr 7 */
5045
#endif
51-
#endif /* _RSI_BOARD_CONFIGURATION_H_ */
46+
#endif /* _RSI_BOARD_CONFIGURATION_H_ */

‎examples/platform/silabs/efr32/wf200/efr_spi.c

-9
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,7 @@ static uint32_t dummy_rx_data;
7979
static uint32_t dummy_tx_data;
8080
static bool spi_enabled = false;
8181

82-
#if defined(EFR32MG12)
83-
uint8_t wirq_irq_nb = SL_WFX_HOST_PINOUT_SPI_IRQ;
84-
#elif defined(EFR32MG24)
8582
uint8_t wirq_irq_nb = SL_WFX_HOST_PINOUT_SPI_WIRQ_PIN; // SL_WFX_HOST_PINOUT_SPI_WIRQ_PIN;
86-
#endif
8783

8884
#define PIN_OUT_SET 1
8985
#define PIN_OUT_CLEAR 0
@@ -102,11 +98,6 @@ sl_status_t sl_wfx_host_init_bus(void)
10298
* EUSARTROUTE register to do this.
10399
*/
104100

105-
#if defined(EFR32MG12)
106-
MY_USART->CTRL |= (1u << _USART_CTRL_SMSDELAY_SHIFT);
107-
MY_USART->ROUTEPEN = USART_ROUTEPEN_TXPEN | USART_ROUTEPEN_RXPEN | USART_ROUTEPEN_CLKPEN;
108-
#endif
109-
110101
#if defined(EFR32MG24)
111102
GPIO->USARTROUTE[0].ROUTEEN = GPIO_USART_ROUTEEN_RXPEN | // MISO
112103
GPIO_USART_ROUTEEN_TXPEN | // MOSI

0 commit comments

Comments
 (0)