[Silabs] Updating the wifi sdk pointer to v3.1.0 (#29718)

* 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]>
project-chip · Oct 12, 2023 · 0264f8b · 0264f8b
1 parent 4dfcf7a
commit 0264f8b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 325 deletions.
diff --git a/examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_m4.c b/examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_m4.c
diff --git a/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp b/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp
@@ -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);
 }
 
@@ -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

diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -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",
@@ -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") {
@@ -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") {
@@ -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
@@ -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",
@@ -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

diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
diff --git a/third_party/silabs/wifi_sdk b/third_party/silabs/wifi_sdk