From 3e07c1f9fb29fe878ee47f9469babefcc82515a7 Mon Sep 17 00:00:00 2001 From: chirag-silabs Date: Sat, 22 Feb 2025 00:03:51 +0530 Subject: [PATCH 1/2] Updating the SiSDK, WiFi SDK and Wiseconnect to latest --- .github/workflows/examples-efr32.yaml | 2 +- .gitmodules | 6 +++--- examples/platform/silabs/matter-platform.slcp | 2 ++ .../platform/silabs/provision/ProvisionStorageFlash.cpp | 4 ++++ third_party/silabs/efr32_sdk.gni | 2 ++ third_party/silabs/matter_support | 2 +- third_party/silabs/simplicity_sdk | 2 +- third_party/silabs/wifi_sdk | 2 +- third_party/silabs/wiseconnect-wifi-bt-sdk | 2 +- 9 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index 83d37f0130541b..684a43a126e037 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -41,7 +41,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-efr32:112 + image: ghcr.io/project-chip/chip-build-efr32:115 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.gitmodules b/.gitmodules index 60bea0835b0a12..86981aa68619aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -213,17 +213,17 @@ [submodule "third_party/silabs/simplicity_sdk"] path = third_party/silabs/simplicity_sdk url = https://github.com/SiliconLabs/simplicity_sdk.git - branch = v2024.6.2 + branch = v2024.12.1-0 platforms = silabs [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"] path = third_party/silabs/wiseconnect-wifi-bt-sdk url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git - branch = 2.10.3 + branch = 2.11.2 platforms = silabs [submodule "third_party/silabs/wifi_sdk"] path = third_party/silabs/wifi_sdk url = https://github.com/SiliconLabs/wiseconnect.git - branch = v3.3.3 + branch = v3.4.1 platforms = silabs [submodule "editline"] path = third_party/editline/repo diff --git a/examples/platform/silabs/matter-platform.slcp b/examples/platform/silabs/matter-platform.slcp index e4adf0743b3fb4..07117d7cb640bd 100644 --- a/examples/platform/silabs/matter-platform.slcp +++ b/examples/platform/silabs/matter-platform.slcp @@ -113,6 +113,8 @@ configuration: - {name: SL_BT_RTOS_LINK_LAYER_TASK_STACK_SIZE, value: 1024} - {name: SL_BT_RTOS_HOST_STACK_TASK_STACK_SIZE, value: 2048} - {name: SL_BT_RTOS_EVENT_HANDLER_STACK_SIZE, value: 1536} +- {name: SL_MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS, value: 1} +- {name: SL_OPENTHREAD_ENABLE_SERIAL_TASK, value: 0} template_contribution: - name: mbedtls_ssl_content_len_in_requirement diff --git a/examples/platform/silabs/provision/ProvisionStorageFlash.cpp b/examples/platform/silabs/provision/ProvisionStorageFlash.cpp index d5d53eb183c98c..3d47e70d5075e8 100644 --- a/examples/platform/silabs/provision/ProvisionStorageFlash.cpp +++ b/examples/platform/silabs/provision/ProvisionStorageFlash.cpp @@ -52,6 +52,10 @@ extern "C" { extern uint8_t linker_nvm_end[]; #endif // SLI_SI91X_MCU_INTERFACE +#if !SL_MATTER_GN_BUILD +#include +#endif + namespace { constexpr size_t kPageSize = FLASH_PAGE_SIZE; constexpr size_t kMaxBinaryValue = 1024; diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni index 644057e2a388c9..a3188df040cfd4 100644 --- a/third_party/silabs/efr32_sdk.gni +++ b/third_party/silabs/efr32_sdk.gni @@ -172,6 +172,7 @@ template("efr32_sdk") { "${efr32_sdk_root}/platform/bootloader", "${efr32_sdk_root}/platform/bootloader/config", "${efr32_sdk_root}/platform/bootloader/config/btl_interface", + "${efr32_sdk_root}/platform/bootloader/core/flash", "${efr32_sdk_root}/platform/bootloader/api", "${efr32_sdk_root}/platform/CMSIS/Core/Include", "${efr32_sdk_root}/platform/CMSIS/RTOS2/Include", @@ -724,6 +725,7 @@ template("efr32_sdk") { "${efr32_sdk_root}/platform/CMSIS/RTOS2/Source/os_systick.c", "${efr32_sdk_root}/platform/bootloader/api/btl_interface.c", "${efr32_sdk_root}/platform/bootloader/api/btl_interface_storage.c", + "${efr32_sdk_root}/platform/bootloader/core/flash/btl_internal_flash.c", "${efr32_sdk_root}/platform/bootloader/security/sha/crypto_sha.c", "${efr32_sdk_root}/platform/common/src/sl_core_cortexm.c", "${efr32_sdk_root}/platform/common/src/sl_slist.c", diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support index 65ed5229f159f8..d39e1d9bcbdcb7 160000 --- a/third_party/silabs/matter_support +++ b/third_party/silabs/matter_support @@ -1 +1 @@ -Subproject commit 65ed5229f159f88490a8938538768b692b6173fb +Subproject commit d39e1d9bcbdcb74fd7b9e2377e7cecf0aa619e1c diff --git a/third_party/silabs/simplicity_sdk b/third_party/silabs/simplicity_sdk index 8627f8482564dc..da661283f301b5 160000 --- a/third_party/silabs/simplicity_sdk +++ b/third_party/silabs/simplicity_sdk @@ -1 +1 @@ -Subproject commit 8627f8482564dc6d94b56512740a39d6f409a0eb +Subproject commit da661283f301b53eec04d1016009e60bc7e34a1f diff --git a/third_party/silabs/wifi_sdk b/third_party/silabs/wifi_sdk index 9f6db891b34936..f675628eefa1ac 160000 --- a/third_party/silabs/wifi_sdk +++ b/third_party/silabs/wifi_sdk @@ -1 +1 @@ -Subproject commit 9f6db891b349369a45da7d66f53f9cd83d3ba260 +Subproject commit f675628eefa1ac4990e94146abb75dd08b522571 diff --git a/third_party/silabs/wiseconnect-wifi-bt-sdk b/third_party/silabs/wiseconnect-wifi-bt-sdk index b6d6cb552beb4e..3dbc243390a993 160000 --- a/third_party/silabs/wiseconnect-wifi-bt-sdk +++ b/third_party/silabs/wiseconnect-wifi-bt-sdk @@ -1 +1 @@ -Subproject commit b6d6cb552beb4ecb6e690e0db4c9d374f8ba1b15 +Subproject commit 3dbc243390a99311968b4d39fe0339b7c8a201ec From 24b970bcdd3e0fb947e457a46678cc8691238255 Mon Sep 17 00:00:00 2001 From: chirag-silabs Date: Sat, 22 Feb 2025 00:21:00 +0530 Subject: [PATCH 2/2] addressing review comments --- .../platform/silabs/provision/ProvisionStorageFlash.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/platform/silabs/provision/ProvisionStorageFlash.cpp b/examples/platform/silabs/provision/ProvisionStorageFlash.cpp index 3d47e70d5075e8..bd396087c6bac7 100644 --- a/examples/platform/silabs/provision/ProvisionStorageFlash.cpp +++ b/examples/platform/silabs/provision/ProvisionStorageFlash.cpp @@ -29,6 +29,10 @@ #include #endif // SL_MATTER_ENABLE_OTA_ENCRYPTION +#if !SL_MATTER_GN_BUILD +#include +#endif + using namespace chip::Credentials; #if SLI_SI91X_MCU_INTERFACE @@ -52,10 +56,6 @@ extern "C" { extern uint8_t linker_nvm_end[]; #endif // SLI_SI91X_MCU_INTERFACE -#if !SL_MATTER_GN_BUILD -#include -#endif - namespace { constexpr size_t kPageSize = FLASH_PAGE_SIZE; constexpr size_t kMaxBinaryValue = 1024;