Skip to content

Commit

Permalink
[Silabs] Updating the wifi sdk pointer to v3.1.0 (#29718)
Browse files Browse the repository at this point in the history
* changes for wifi sdk 3_1_0

* updating the matter support to point to main

* added missed commas

* Restyled by clang-format

* Restyled by gn

---------

Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
chirag-silabs and restyled-commits authored Oct 12, 2023
1 parent 4dfcf7a commit 0264f8b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 325 deletions.
304 changes: 0 additions & 304 deletions examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_m4.c

This file was deleted.

19 changes: 2 additions & 17 deletions src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,9 @@
// TODO add includes ?
extern "C" {
#include "em_core.h"
#include "rsi_board.h"
#include "sl_event_handler.h"

void RSI_Board_LED_Set(int, bool);
void RSI_Board_LED_Toggle(int);
void RSI_Wakeupsw_config(void);
void RSI_Wakeupsw_config_gpio0(void);
#ifdef SI917_RADIO_BOARD_V2
void RSI_Wakeupsw_config_gpio11(void);
#endif
void sl_system_init(void);
#include "sl_system_init.h"
void soc_pll_config(void);
}

Expand All @@ -63,14 +56,6 @@ CHIP_ERROR SilabsPlatform::Init(void)
// Configuration the clock rate
soc_pll_config();

// BTN0 and BTN1 init
RSI_Wakeupsw_config();
#ifdef SI917_RADIO_BOARD_V2
RSI_Wakeupsw_config_gpio11();
#else
RSI_Wakeupsw_config_gpio0();
#endif

#if SILABS_LOG_ENABLED
silabsInitLog();
#endif
Expand Down
10 changes: 8 additions & 2 deletions third_party/silabs/SiWx917_sdk.gni
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ template("siwx917_sdk") {
_include_dirs = [
"${chip_root}",
"${chip_root}/examples/platform/silabs/SiWx917/SiWx917",
"${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/support/hal",
"${efr32_sdk_root}/platform/emdrv/nvm3/inc",
"${efr32_sdk_root}/platform/emdrv/common/inc",
"${efr32_sdk_root}/platform/service/device_init/inc",
Expand Down Expand Up @@ -130,6 +129,9 @@ template("siwx917_sdk") {
"${efr32_sdk_root}/platform/service/sleeptimer/config",
"${efr32_sdk_root}/platform/service/sleeptimer/src",
"${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/support/inc",

"${efr32_sdk_root}/platform/service/iostream/inc",
"${wifi_sdk_root}/components/siwx917_soc/drivers/hardware_drivers/button/inc",
]

if (silabs_board == "BRD4338A") {
Expand Down Expand Up @@ -191,6 +193,7 @@ template("siwx917_sdk") {
"SL_NVM3_PRESENT",
"ROM_WIRELESS",
"BRD4325A", #TODO: should be removed after SoC macro clean-up
"CONNECTIVITY_PLATFORM",
]

if (silabs_board == "BRD4325B") {
Expand Down Expand Up @@ -410,7 +413,6 @@ template("siwx917_sdk") {
"${efr32_sdk_root}/util/third_party/freertos/kernel/timers.c",
"${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/autogen/sl_event_handler.c",
"${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/support/hal/rsi_hal_mcu_m4.c",
"${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/support/hal/rsi_hal_mcu_platform_init.c",
"${wifi_sdk_root}/components/siwx917_soc/drivers/service/nvm3/src/sl_si91x_nvm3_hal_flash.c",

# mbedtls
Expand All @@ -436,6 +438,8 @@ template("siwx917_sdk") {
"${chip_root}/third_party/mbedtls/repo/library/sha256.c",
"${chip_root}/third_party/mbedtls/repo/library/sha512.c",
"${chip_root}/third_party/mbedtls/repo/library/x509_create.c",
"${efr32_sdk_root}/platform/service/iostream/src/sl_iostream.c",
"${efr32_sdk_root}/platform/service/iostream/src/sl_iostream_rtt.c",
"${sdk_support_root}/matter/mbedtls/tinycrypt/src/ecc.c",
"${sdk_support_root}/matter/mbedtls/tinycrypt/src/ecc_dh.c",
"${sdk_support_root}/matter/mbedtls/tinycrypt/src/ecc_dsa.c",
Expand All @@ -448,6 +452,8 @@ template("siwx917_sdk") {
"${sdk_support_root}/matter/mbedtls/tinycrypt/src/platform_util.c",
"${sdk_support_root}/matter/mbedtls/tinycrypt/src/x509_crt.c",
"${sdk_support_root}/matter/mbedtls/tinycrypt/src/x509write_csr.c",
"${sdk_support_root}/matter/si91x/siwx917/${sdk_support_board}/autogen/sl_si91x_button_instances.c",
"${wifi_sdk_root}/components/siwx917_soc/drivers/hardware_drivers/button/src/sl_si91x_button.c",
]

# nvm3 ans startup
Expand Down
2 changes: 1 addition & 1 deletion third_party/silabs/matter_support
Submodule matter_support updated 57 files
+1 −1 matter/efr32/efr32mg12/BRD4161A/config/sl_uartdrv_usart_vcom_config.h
+1 −1 matter/efr32/efr32mg12/BRD4163A/config/sl_uartdrv_usart_vcom_config.h
+1 −1 matter/efr32/efr32mg12/BRD4164A/config/sl_uartdrv_usart_vcom_config.h
+9 −0 matter/efr32/efr32mg12/BRD4304A/autogen/sl_event_handler.c
+27 −0 matter/efr32/efr32mg12/BRD4304A/autogen/sl_iostream_handles.c
+20 −0 matter/efr32/efr32mg12/BRD4304A/autogen/sl_iostream_handles.h
+16 −0 matter/efr32/efr32mg12/BRD4304A/autogen/sl_iostream_init_instances.h
+1 −1 matter/efr32/efr32mg12/BRD4304A/config/sl_uartdrv_usart_vcom_config.h
+8 −0 matter/efr32/efr32mg24/BRD2703A/autogen/sl_event_handler.c
+27 −0 matter/efr32/efr32mg24/BRD2703A/autogen/sl_iostream_handles.c
+20 −0 matter/efr32/efr32mg24/BRD2703A/autogen/sl_iostream_handles.h
+16 −0 matter/efr32/efr32mg24/BRD2703A/autogen/sl_iostream_init_instances.h
+1 −1 matter/efr32/efr32mg24/BRD2703A/config/sl_uartdrv_eusart_vcom_config.h
+9 −0 matter/efr32/efr32mg24/BRD4186A/autogen/sl_event_handler.c
+27 −0 matter/efr32/efr32mg24/BRD4186A/autogen/sl_iostream_handles.c
+20 −0 matter/efr32/efr32mg24/BRD4186A/autogen/sl_iostream_handles.h
+16 −0 matter/efr32/efr32mg24/BRD4186A/autogen/sl_iostream_init_instances.h
+1 −1 matter/efr32/efr32mg24/BRD4186A/config/sl_uartdrv_eusart_vcom_config.h
+9 −0 matter/efr32/efr32mg24/BRD4186C/autogen/sl_event_handler.c
+27 −0 matter/efr32/efr32mg24/BRD4186C/autogen/sl_iostream_handles.c
+20 −0 matter/efr32/efr32mg24/BRD4186C/autogen/sl_iostream_handles.h
+16 −0 matter/efr32/efr32mg24/BRD4186C/autogen/sl_iostream_init_instances.h
+1 −1 matter/efr32/efr32mg24/BRD4186C/config/sl_uartdrv_eusart_vcom_config.h
+9 −0 matter/efr32/efr32mg24/BRD4187A/autogen/sl_event_handler.c
+27 −0 matter/efr32/efr32mg24/BRD4187A/autogen/sl_iostream_handles.c
+20 −0 matter/efr32/efr32mg24/BRD4187A/autogen/sl_iostream_handles.h
+16 −0 matter/efr32/efr32mg24/BRD4187A/autogen/sl_iostream_init_instances.h
+1 −1 matter/efr32/efr32mg24/BRD4187A/config/sl_uartdrv_eusart_vcom_config.h
+1 −1 matter/efr32/efr32mg24/BRD4187C/config/sl_uartdrv_eusart_vcom_config.h
+1 −1 matter/efr32/mgm24/BRD4316A/config/sl_uartdrv_eusart_vcom_config.h
+1 −1 matter/efr32/mgm24/BRD4317A/config/sl_uartdrv_eusart_vcom_config.h
+1 −1 matter/efr32/mgm24/BRD4318A/config/sl_uartdrv_eusart_vcom_config.h
+1 −1 matter/efr32/mgm24/BRD4319A/config/sl_uartdrv_eusart_vcom_config.h
+6 −0 matter/si91x/siwx917/BRD4325x/autogen/sl_component_catalog.h
+8 −8 matter/si91x/siwx917/BRD4325x/autogen/sl_event_handler.c
+1 −0 matter/si91x/siwx917/BRD4325x/autogen/sl_event_handler.h
+47 −0 matter/si91x/siwx917/BRD4325x/autogen/sl_si91x_button_instances.c
+42 −0 matter/si91x/siwx917/BRD4325x/autogen/sl_si91x_button_instances.h
+479 −0 matter/si91x/siwx917/BRD4325x/config/SEGGER_RTT_Conf.h
+25 −0 matter/si91x/siwx917/BRD4325x/config/sl_si91x_button_config.h
+65 −61 matter/si91x/siwx917/BRD4325x/support/hal/rsi_hal_mcu_m4.c
+0 −202 matter/si91x/siwx917/BRD4325x/support/hal/rsi_hal_mcu_platform_init.c
+0 −216 matter/si91x/siwx917/BRD4325x/support/hal/rsi_hal_mcu_timer.c
+7 −27 matter/si91x/siwx917/BRD4338A/autogen/sl_component_catalog.h
+7 −5 matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.c
+1 −0 matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.h
+27 −0 matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_handles.c
+19 −0 matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_handles.h
+16 −0 matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_init_instances.h
+47 −0 matter/si91x/siwx917/BRD4338A/autogen/sl_si91x_button_instances.c
+42 −0 matter/si91x/siwx917/BRD4338A/autogen/sl_si91x_button_instances.h
+479 −0 matter/si91x/siwx917/BRD4338A/config/SEGGER_RTT_Conf.h
+57 −0 matter/si91x/siwx917/BRD4338A/config/glib_config.h
+25 −0 matter/si91x/siwx917/BRD4338A/config/sl_si91x_button_config.h
+64 −73 matter/si91x/siwx917/BRD4338A/support/hal/rsi_hal_mcu_m4.c
+0 −206 matter/si91x/siwx917/BRD4338A/support/hal/rsi_hal_mcu_platform_init.c
+0 −216 matter/si91x/siwx917/BRD4338A/support/hal/rsi_hal_mcu_timer.c
2 changes: 1 addition & 1 deletion third_party/silabs/wifi_sdk
Submodule wifi_sdk updated 1517 files

0 comments on commit 0264f8b

Please sign in to comment.