Merge branch 'release_2.8-1.5' into cherry-pick/em-tracing-component

Author: malbert-silabs

slc/component/matter-core-sdk/efr32.slcc

@@ -98,7 +98,7 @@ include:
   - path: third_party/matter_sdk/src/lwip/silabs
     file_list:
       - path: lwipopts-wf200.h
-      - path: lwipopts-rs911x.h
+      - path: lwipopts-siwx.h
       - path: lwippools.h
       - path: lwipopts.h
   - path: third_party/matter_sdk/examples/platform/silabs

slc/component/matter-core-sdk/efr32_wifi.slcc

@@ -99,7 +99,7 @@ include:
 - path: third_party/matter_sdk/src/lwip/silabs
   file_list:
   - path: lwipopts-wf200.h
-  - path: lwipopts-rs911x.h
+  - path: lwipopts-siwx.h
   - path: lwippools.h
   - path: lwipopts.h
 - path: third_party/matter_sdk/examples/platform/silabs

slc/component/matter-core-sdk/siwx917.slcc

@@ -17,7 +17,7 @@ include:
 - path: third_party/matter_sdk/src
 - path: third_party/matter_sdk/src/include
 - path: third_party/matter_sdk/src/lib
-- path: third_party/matter_sdk/src/platform/silabs/SiWx917
+- path: third_party/matter_sdk/src/platform/silabs/SiWx
 - path: third_party/matter_sdk/src/platform/silabs/wifi
 - path: third_party/nlassert/include
 - path: third_party/nlio/include
@@ -100,7 +100,7 @@ include:
 - path: third_party/matter_sdk/src/lwip/silabs
   file_list:
   - path: lwipopts-wf200.h
-  - path: lwipopts-rs911x.h
+  - path: lwipopts-siwx.h
   - path: lwippools.h
   - path: lwipopts.h
 - path: third_party/matter_sdk/examples/platform/silabs
@@ -123,11 +123,10 @@ include:
   file_list:
   - path: SilabsPlatformBase.h
   - path: SilabsPlatform.h
-- path: third_party/matter_sdk/src/platform/silabs/rs911x
+- path: third_party/matter_sdk/src/platform/silabs/SiWx/ble
   file_list:
   - path: ble_config.h
-  - path: wfx_sl_ble_init.h
-  - path: rsi_ble_config.h
+  - path: sl_si91x_ble_init.h
 - path: third_party/matter_sdk/src/platform
   file_list:
   - path: DeviceSafeQueue.h
@@ -158,7 +157,7 @@ include:
   - path: SystemTimeSupport.h
   - path: GenericThreadStackManagerImpl_FreeRTOS.h
   - path: GenericThreadStackManagerImpl_FreeRTOS.hpp
-- path: third_party/matter_sdk/src/platform/silabs/SiWx917
+- path: third_party/matter_sdk/src/platform/silabs/SiWx
   file_list:
   - path: siwx917-chip-psa-config.h
   - path: siwx917-chip-mbedtls-config.h
@@ -182,13 +181,13 @@ source:
 - path: third_party/matter_sdk/src/platform/silabs/Logging.cpp
 - path: third_party/matter_sdk/src/platform/silabs/MigrationManager.cpp
 - path: third_party/matter_sdk/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp
-- path: third_party/matter_sdk/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp
+- path: third_party/matter_sdk/src/platform/silabs/SiWx/OTAImageProcessorImpl.cpp
 - path: third_party/matter_sdk/src/platform/silabs/PlatformManagerImpl.cpp
 - path: third_party/matter_sdk/src/platform/silabs/SilabsConfig.cpp
 - path: third_party/matter_sdk/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp
 - path: third_party/matter_sdk/src/platform/silabs/platformAbstraction/SilabsPlatform.cpp
-- path: third_party/matter_sdk/src/platform/silabs/rs911x/BLEManagerImpl.cpp
-- path: third_party/matter_sdk/src/platform/silabs/rs911x/wfx_sl_ble_init.cpp
+- path: third_party/matter_sdk/src/platform/silabs/SiWx/ble/BLEManagerImpl.cpp
+- path: third_party/matter_sdk/src/platform/silabs/SiWx/ble/sl_si91x_ble_init.cpp
 - path: third_party/matter_sdk/src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.cpp
 - path: third_party/matter_sdk/src/platform/silabs/wifi/WifiInterface.cpp
 

slc/component/matter-core-sdk/siwx917_common.slcc

@@ -37,7 +37,7 @@ include:
   - path: MemMonitoring.h
   - path: BaseApplication.h
   - path: BaseAppEvent.h
-- path: third_party/matter_sdk/src/platform/silabs/SiWx917
+- path: third_party/matter_sdk/src/platform/silabs/SiWx
   file_list:
   - path: SiWxPlatformInterface.h
 

slc/component/matter-core-sdk/siwx917_tinycrypt.slcc

@@ -8,7 +8,7 @@ include:
   - path: .
   - path: third_party/matter_sdk/examples/platform/silabs
   - path: third_party/matter_sdk/src/lib
-  - path: third_party/matter_sdk/src/platform/silabs/SiWx917
+  - path: third_party/matter_sdk/src/platform/silabs/SiWx
   - path: third_party/mbedtls/library
     file_list:
       - path: constant_time_invasive.h

slc/component/matter-platform/matter_platform_siwx917.slcc

@@ -66,7 +66,7 @@ define:
     value: 1
   - name: DEBUG_UART
     value: "1"
-  - name: RS911X_WIFI
+  - name: SL_MATTER_SIWX_WIFI_ENABLE
   - name: SL_SI91x_DUAL_INTERRUPTS_ERRATA
   - name: NVM3_LOCK_OVERRIDE
 toolchain_settings:

slc/component/matter-platform/ota/matter_ota_support.slcc

@@ -21,7 +21,7 @@ source:
   - path: third_party/matter_sdk/examples/platform/silabs/OTAConfig.cpp
   - path: third_party/matter_sdk/src/platform/silabs/efr32/OTAImageProcessorImpl.cpp
     condition: [matter_platform_mg]
-  - path: third_party/matter_sdk/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp
+  - path: third_party/matter_sdk/src/platform/silabs/SiWx/OTAImageProcessorImpl.cpp
     condition: [matter_platform_siwx917]
 config_file:
   - path: slc/config/sl_matter_ota_config.h

slc/component/matter-platform/siwx917/matter_crypto_psa_siwx917.slcc

@@ -80,7 +80,7 @@ include:
       - path: CHIPCryptoPAL.h
       - path: OperationalKeystore.h
       - path: SessionKeystore.h
-  - path: third_party/matter_sdk/src/platform/silabs/SiWx917
+  - path: third_party/matter_sdk/src/platform/silabs/SiWx
     file_list:
       - path: siwx917-chip-mbedtls-config.h
       - path: siwx917-chip-psa-config.h

slc/component/matter-platform/siwx917/matter_crypto_tinycrypt_siwx917.slcc

@@ -49,14 +49,14 @@ conflicts:
 
 source:
   # tinycrypt source
-  - path: third_party/matter_sdk/src/platform/silabs/SiWx917/CHIPCryptoPALTinyCrypt.cpp
+  - path: third_party/matter_sdk/src/platform/silabs/SiWx/CHIPCryptoPALTinyCrypt.cpp
   - path: third_party/matter_support/tinycrypt/src/ecc.c
   - path: third_party/matter_support/tinycrypt/src/ecc_dh.c
   - path: third_party/matter_support/tinycrypt/src/ecc_dsa.c
   - path: third_party/matter_support/tinycrypt/src/tinycrypt_util.c
 
 include:
-  - path: third_party/matter_sdk/src/platform/silabs/SiWx917
+  - path: third_party/matter_sdk/src/platform/silabs/SiWx
     file_list:
       - path: siwx917-chip-mbedtls-config.h
   - path: third_party/matter_support/tinycrypt/inc

slc/component/matter-wifi/917-ncp/siwx917_ncp.slcc

@@ -38,11 +38,10 @@ include:
 - path: third_party/matter_sdk/src/platform/silabs/wifi/ncp
   file_list:
   - path: spi_multiplex.h
-- path: third_party/matter_sdk/src/platform/silabs/rs911x
+- path: third_party/matter_sdk/src/platform/silabs/SiWx/ble
   file_list:
   - path: ble_config.h
-  - path: rsi_ble_config.h
-  - path: wfx_sl_ble_init.h
+  - path: sl_si91x_ble_init.h
 - path: third_party/matter_sdk/src/platform/silabs/wifi
   file_list:
   - path: wfx_msgs.h
@@ -58,22 +57,18 @@ source:
 - path: third_party/matter_sdk/src/platform/silabs/wifi/SiWx/ncp/efx32_ncp_host.c
 - path: third_party/matter_sdk/src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.cpp
 - path: third_party/matter_sdk/src/platform/silabs/wifi/SiWx/ncp/sl_si91x_ncp_utility.c
-- path: third_party/matter_sdk/src/platform/silabs/rs911x/BLEManagerImpl.cpp
-- path: third_party/matter_sdk/src/platform/silabs/rs911x/wfx_sl_ble_init.cpp
+- path: third_party/matter_sdk/src/platform/silabs/SiWx/ble/BLEManagerImpl.cpp
+- path: third_party/matter_sdk/src/platform/silabs/SiWx/ble/sl_si91x_ble_init.cpp
 
 define:
-- name: RS911X_WIFI
+- name: SL_MATTER_SIWX_WIFI_ENABLE
 - name: EXP_BOARD
   value: 1
 - name: CHIP_9117
   value: 1
 - name: SL_WFX_CONFIG_SCAN
   value: 1
 - name: SL_WFX_USE_SPI
-- name: EFX32_RS911X
-  value: 1
-- name: RSI_WLAN_ENABLE
-- name: RSI_SPI_INTERFACE
 - name: RSI_WITH_OS
 - name: SL_WIFI_COMPONENT_INCLUDED
 - name: __WEAK