Skip to content

Commit c87ece5

Browse files
jmartinez-silabsmkardous-silabslpbeliveau-silabs
authored
[Silabs] Update Silabs Submodules to pick up our latest SDK versions (#41493)
* Bump silabs submodules to use our latest SDKS * Bump docker version used in silabs workflow to pick up the docker image with the new sdks * Update examples-efr32.yaml Co-authored-by: lpbeliveau-silabs <112982107+lpbeliveau-silabs@users.noreply.github.com> * remove usage of sl_memory_manager_retarget. 917 when back to heap4 and use sl_memory_manager_redirect --------- Co-authored-by: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com> Co-authored-by: lpbeliveau-silabs <112982107+lpbeliveau-silabs@users.noreply.github.com>
1 parent 17710f1 commit c87ece5

File tree

7 files changed

+6
-21
lines changed

7 files changed

+6
-21
lines changed

.github/workflows/examples-efr32.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
if: github.actor != 'restyled-io[bot]'
4242

4343
container:
44-
image: ghcr.io/project-chip/chip-build-efr32:168
44+
image: ghcr.io/project-chip/chip-build-efr32:171
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

.github/workflows/release_artifacts.yaml

Lines changed: 1 addition & 1 deletion
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:168
67+
image: ghcr.io/project-chip/chip-build-efr32:171
6868
steps:
6969
- name: Checkout
7070
uses: actions/checkout@v5

examples/platform/silabs/SiWx917/BUILD.gn

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ config("chip_examples_project_config") {
4646
# library with the sl_memory_manager in platform code.
4747
ldflags = [
4848
"-Wl,--wrap=MemoryAlloc",
49-
50-
# Wrap these in case internal newlib call them (e.g. strdup will)
51-
# directly call _malloc_r)
52-
"-Wl,--wrap=_malloc_r",
53-
"-Wl,--wrap=_realloc_r",
54-
"-Wl,--wrap=_free_r",
55-
"-Wl,--wrap=_calloc_r",
5649
"-Wl,--wrap=main",
5750
]
5851
}

third_party/silabs/SiWx917_sdk.gni

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,6 @@ template("siwx917_sdk") {
143143
# sl memory manager
144144
"${efr32_sdk_root}/platform/service/memory_manager/inc",
145145
"${efr32_sdk_root}/platform/service/memory_manager/src",
146-
"${efr32_sdk_root}/platform/service/memory_manager/profiler/inc",
147-
"${efr32_sdk_root}/platform/service/memory_manager/profiler/config",
148-
"${efr32_sdk_root}/util/silicon_labs/silabs_core/memory_manager",
149146

150147
# OTA
151148
"${wifi_sdk_root}/components/device/silabs/si91x/wireless/firmware_upgrade",
@@ -751,15 +748,10 @@ template("siwx917_sdk") {
751748
"${wifi_sdk_root}/components/device/silabs/si91x/mcu/drivers/service/nvm3/src/sl_si91x_nvm3_hal_flash.c",
752749

753750
# sl memory manager
754-
"${efr32_sdk_root}/platform/service/memory_manager/profiler/src/sli_memory_profiler_stubs.c",
755-
"${efr32_sdk_root}/platform/service/memory_manager/src/sl_memory_manager.c",
756751
"${efr32_sdk_root}/platform/service/memory_manager/src/sl_memory_manager_cpp.cpp",
757-
"${efr32_sdk_root}/platform/service/memory_manager/src/sl_memory_manager_dynamic_reservation.c",
758752
"${efr32_sdk_root}/platform/service/memory_manager/src/sl_memory_manager_pool.c",
759753
"${efr32_sdk_root}/platform/service/memory_manager/src/sl_memory_manager_pool_common.c",
760-
"${efr32_sdk_root}/platform/service/memory_manager/src/sl_memory_manager_region.c",
761-
"${efr32_sdk_root}/platform/service/memory_manager/src/sl_memory_manager_retarget.c",
762-
"${efr32_sdk_root}/platform/service/memory_manager/src/sli_memory_manager_common.c",
754+
"${efr32_sdk_root}/platform/service/memory_manager/src/sl_memory_manager_redirect.c",
763755

764756
# iostream
765757
"${efr32_sdk_root}/platform/service/iostream/src/sl_iostream.c",

third_party/silabs/matter_support

Submodule matter_support updated 78 files

third_party/silabs/simplicity_sdk

Submodule simplicity_sdk updated 2324 files

third_party/silabs/wifi_sdk

Submodule wifi_sdk updated 967 files

0 commit comments

Comments
 (0)