Skip to content

Commit 58536ba

Browse files
[Silabs]Update Submodules, API, gn files to use latest silabs sdks (#34073)
* add simplicity sdk as submodule. remove gecko_sdk. Change wifi sdk branch * Reamove Heap_4_silabs, replace by sl_memory_manager Update matter-platform.slcp for simplicity sdk * Update 917 apis for wifi sdk 3.3.0 * Workflow to use latest silabs docker image * Fix to leverage csl on thread libs * bump matter support submodule * Restyled by clang-format * Restyled by autopep8 * fix linking issue with thread FTD lib * clean up * fix wifi ncp builds * update linker script for mgm24 and si917 --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 857accf commit 58536ba

33 files changed

+564
-1424
lines changed

.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-efr32:54
43+
image: ghcr.io/project-chip/chip-build-efr32:56
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

.github/workflows/release_artifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
runs-on: ubuntu-latest
6565

6666
container:
67-
image: ghcr.io/project-chip/chip-build-efr32:54
67+
image: ghcr.io/project-chip/chip-build-efr32:56
6868
steps:
6969
- name: Checkout
7070
uses: actions/checkout@v4

.gitmodules

+5-5
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@
231231
url = https://github.com/SiliconLabs/sdk_support.git
232232
branch = main
233233
platforms = silabs,silabs_docker
234-
[submodule "third_party/silabs/gecko_sdk"]
235-
path = third_party/silabs/gecko_sdk
236-
url = https://github.com/SiliconLabs/gecko_sdk.git
237-
branch = v4.4.2
234+
[submodule "third_party/silabs/simplicity_sdk"]
235+
path = third_party/silabs/simplicity_sdk
236+
url = https://github.com/SiliconLabs/simplicity_sdk.git
237+
branch = v2024.6.0
238238
platforms = silabs
239239
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
240240
path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -244,7 +244,7 @@
244244
[submodule "third_party/silabs/wifi_sdk"]
245245
path = third_party/silabs/wifi_sdk
246246
url = https://github.com/SiliconLabs/wiseconnect.git
247-
branch = v3.1.3-matter-hotfix.4
247+
branch = v3.3.0
248248
platforms = silabs
249249
[submodule "editline"]
250250
path = third_party/editline/repo

examples/light-switch-app/silabs/.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ check_system_includes = true
2323
default_args = {
2424
target_cpu = "arm"
2525
target_os = "freertos"
26-
chip_openthread_ftd = true
26+
chip_openthread_ftd = false
2727

2828
import("//openthread.gni")
2929
}

examples/platform/silabs/SiWx917/BUILD.gn

+1-7
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,8 @@ config("chip_examples_project_config") {
5959
include_dirs = [ "project_include" ]
6060

6161
# Link options that provide a replacement for dynamic memory operations in standard
62-
# library with the FreeRTOS malloc in platform code.
62+
# library with the sl_memory_manager in platform code.
6363
ldflags = [
64-
# memory allocation -- these must be re-entrant and do locking
65-
"-Wl,--wrap=malloc",
66-
"-Wl,--wrap=free",
67-
"-Wl,--wrap=realloc",
68-
"-Wl,--wrap=calloc",
6964
"-Wl,--wrap=MemoryAlloc",
7065

7166
# Wrap these in case internal newlib call them (e.g. strdup will)
@@ -234,7 +229,6 @@ source_set("siwx917-common") {
234229
"${silabs_common_plat_dir}/LEDWidget.cpp",
235230
"${silabs_common_plat_dir}/MatterConfig.cpp",
236231
"${silabs_common_plat_dir}/SoftwareFaultReports.cpp",
237-
"${silabs_common_plat_dir}/heap_4_silabs.c",
238232
"${silabs_common_plat_dir}/silabs_utils.cpp",
239233
"${silabs_common_plat_dir}/syscalls_stubs.cpp",
240234
"${silabs_plat_si91x_wifi_dir}/dhcp_client.cpp",

0 commit comments

Comments
 (0)