Skip to content

Commit 5772345

Browse files
jmartinez-silabsrestyled-commits
authored and
pull[bot]
committed
[Silabs ]Update to GSDK 4.2.3 (#27618)
* Pull request #898: Update submodules for gecko_sdk 4.2.3 and matter_support for generated board configs, update efr32_sdk.gni to match gen files. Merge in WMN_TOOLS/matter from Gsdk4.2.3_update_2.1.0-1.1 to RC_2.1.0-1.1 Squashed commit of the following: commit bbbb38f3913607e3b171cff35c933f515cf096e1 Author: Junior Martinez <[email protected]> Date: Mon Jun 19 22:34:42 2023 -0400 fem util cleanup commit f9b8ebb61cd3f6a56e44b3e0b31ecd34b51aa25f Author: Junior Martinez <[email protected]> Date: Mon Jun 19 20:53:34 2023 -0400 matter_support points to new main commit commit 2e292e959b4c23eaf9635680599b5d8eb4215456 Author: Junior Martinez <[email protected]> Date: Mon Jun 19 20:20:49 2023 -0400 fix brd4319A ... and 7 more commits * Pull request #903: Fix system time counter Merge in WMN_TOOLS/matter from fix/time_drift to RC_2.1.0-1.1 Squashed commit of the following: commit e34404ff67f6c1219ef4cbf39e64fc2cc4084870 Author: Satya Naag Bollimpalli <[email protected]> Date: Wed Jun 21 11:02:30 2023 +0000 Pull request #904: changing the unify git location from cph to stash Merge in WMN_TOOLS/matter from bugfix/matter-bridge-jenkins-unify-git-location-change to silabs_1.1 Squashed commit of the following: commit 0b9db3c60485b21fbabcb6f592ea09ba8c1b6c36 Author: sabollim <[email protected]> Date: Wed Jun 21 09:45:37 2023 +0530 changing the unify git location from bitbucket-cph to stash commit 0859339d2bf0f20ea0bb5acded2fd3b7459c10d8 Author: sabollim <[email protected]> Date: Wed Jun 21 09:24:07 2023 +0530 changing the unify git location from cph to stash commit 63dfc3f438d416645a07878859b8886ba6a3eafb Author: Junior Martinez <[email protected]> Date: Tue Jun 20 21:27:25 2023 -0400 update matter_support submodule hash commit 889cfb413e47452e09c03b7b0ba88da313738a7a Author: Junior Martinez <[email protected]> Date: Tue Jun 20 20:01:40 2023 -0400 Always build tick_power_manager.c has we now how sleeptimer and power manager always on. Fix paths for segger system view debugging Pull request #907: [Silabs][Wf200] Disabling sleep Merge in WMN_TOOLS/matter from bugfix/wf200_sleep to RC_2.1.0-1.1 Squashed commit of the following: commit c14edfc41dd9e8427fd242f3fcd3055043cb33ec Author: Chirag Bansal <[email protected]> Date: Thu Jun 22 11:24:49 2023 +0530 changing the condition so that wf200 doesn't go in sleep by default commit 694226bfb43e8fdfe0e2bb16fd8570bb740aec07 Author: Jean-Francois Penven <[email protected]> Date: Mon May 29 10:11:02 2023 -0400 Fix matter shell with wf200 (#26845) * Restyled by whitespace * Restyled by clang-format * pull new docker image for chip-build-efr32 --------- Co-authored-by: Restyled.io <[email protected]>
1 parent 4d181df commit 5772345

File tree

6 files changed

+62
-48
lines changed

6 files changed

+62
-48
lines changed

‎.github/workflows/examples-efr32.yaml

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

4040
container:
41-
image: connectedhomeip/chip-build-efr32:0.7.3
41+
image: connectedhomeip/chip-build-efr32:0.7.25
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

‎examples/platform/silabs/efr32/wf200/host_if.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -602,15 +602,15 @@ static void wfx_events_task(void * p_arg)
602602
retryJoin = 0;
603603
retryInterval = WLAN_MIN_RETRY_TIMER_MS;
604604
wfx_lwip_set_sta_link_up();
605-
#ifdef SLEEP_ENABLED
605+
#if CHIP_DEVICE_CONFIG_ENABLE_SED
606606
if (!(wfx_get_wifi_state() & SL_WFX_AP_INTERFACE_UP))
607607
{
608608
// Enable the power save
609609
SILABS_LOG("WF200 going to DTIM based sleep");
610610
sl_wfx_set_power_mode(WFM_PM_MODE_DTIM, WFM_PM_POLL_FAST_PS, BEACON_1);
611611
sl_wfx_enable_device_power_save();
612612
}
613-
#endif // SLEEP_ENABLED
613+
#endif /* CHIP_DEVICE_CONFIG_ENABLE_SED */
614614
}
615615

616616
if (flags & SL_WFX_DISCONNECT)

‎src/platform/silabs/efr32/psa_crypto_config.h

+40
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,43 @@
8181

8282
#define MBEDTLS_PSA_KEY_SLOT_COUNT (15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT)
8383
#define SL_PSA_ITS_MAX_FILES (1 + SL_PSA_ITS_USER_MAX_FILES)
84+
85+
#if defined(TFM_CONFIG_SL_SECURE_LIBRARY)
86+
// Asymmetric Crypt module (RSA is not supported)
87+
#define TFM_CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED
88+
89+
// HASH module
90+
#if !defined(PSA_WANT_ALG_SHA_1) && !defined(PSA_WANT_ALG_SHA_224) && !defined(PSA_WANT_ALG_SHA_256) && \
91+
!defined(PSA_WANT_ALG_SHA_384) && !defined(PSA_WANT_ALG_SHA_512) && !defined(PSA_WANT_ALG_MD5)
92+
#define TFM_CRYPTO_HASH_MODULE_DISABLED
93+
#endif
94+
95+
// AEAD module
96+
#if !defined(PSA_WANT_ALG_CCM) && !defined(PSA_WANT_ALG_GCM) && !defined(PSA_WANT_ALG_CHACHA20_POLY1305)
97+
#define TFM_CRYPTO_AEAD_MODULE_DISABLED
98+
#endif
99+
100+
// Asymmetric Sign module
101+
#if !defined(PSA_WANT_ALG_ECDSA) && !defined(PSA_WANT_ALG_EDDSA) && !defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA)
102+
#define TFM_CRYPTO_ASYM_SIGN_MODULE_DISABLED
103+
#endif
104+
105+
// Cipher module
106+
#if !defined(PSA_WANT_ALG_CFB) && !defined(PSA_WANT_ALG_CTR) && !defined(PSA_WANT_ALG_CBC_NO_PADDING) && \
107+
!defined(PSA_WANT_ALG_CBC_PKCS7) && !defined(PSA_WANT_ALG_ECB_NO_PADDING) && !defined(PSA_WANT_ALG_XTS) && \
108+
!defined(PSA_WANT_ALG_OFB) && !defined(PSA_WANT_ALG_STREAM_CIPHER)
109+
#define TFM_CRYPTO_CIPHER_MODULE_DISABLED
110+
#endif
111+
112+
// MAC module
113+
#if !defined(PSA_WANT_ALG_HMAC) && !defined(PSA_WANT_ALG_CMAC) && !defined(PSA_WANT_ALG_CBC_MAC)
114+
#define TFM_CRYPTO_MAC_MODULE_DISABLED
115+
#endif
116+
117+
// Key derivation module
118+
#if !defined(PSA_WANT_ALG_PBKDF2_HMAC) && !defined(PSA_WANT_ALG_HKDF) && !defined(PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128) && \
119+
!defined(PSA_WANT_ALG_TLS12_PRF) && !defined(PSA_WANT_ALG_TLS12_PSK_TO_MS) && !defined(PSA_WANT_ALG_ECDH)
120+
#define TFM_CRYPTO_KEY_DERIVATION_MODULE_DISABLED
121+
#endif
122+
123+
#endif // TFM_CONFIG_SL_SECURE_LIBRARY

‎third_party/silabs/efr32_sdk.gni

+17-43
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ template("efr32_sdk") {
113113
"${efr32_sdk_root}/hardware/board/inc",
114114
"${efr32_sdk_root}/hardware/driver/memlcd/inc",
115115
"${efr32_sdk_root}/hardware/driver/memlcd/src/ls013b7dh03",
116+
"${efr32_sdk_root}/hardware/driver/configuration_over_swo/inc/",
116117
"${efr32_sdk_root}/platform/bootloader",
117118
"${efr32_sdk_root}/platform/bootloader/config",
118119
"${efr32_sdk_root}/platform/bootloader/config/s2/btl_interface",
@@ -179,11 +180,6 @@ template("efr32_sdk") {
179180
"${silabs_gen_folder}/autogen",
180181
]
181182

182-
if (slc_generate || slc_reuse_files || silabs_family == "mgm24") {
183-
_include_dirs +=
184-
[ "${efr32_sdk_root}/hardware/driver/configuration_over_swo/inc/" ]
185-
}
186-
187183
if (silabs_family != "mgm24") {
188184
_include_dirs += [
189185
"${efr32_sdk_root}/platform/radio/rail_lib/hal",
@@ -227,6 +223,8 @@ template("efr32_sdk") {
227223
"SL_COMPONENT_CATALOG_PRESENT=1",
228224
"PLATFORM_HEADER=\"platform-header.h\"",
229225
"USE_NVM3=1",
226+
"SL_CATALOG_POWER_MANAGER_PRESENT",
227+
"SL_CATALOG_SLEEPTIMER_PRESENT",
230228

231229
#"__STACK_SIZE=0",
232230
]
@@ -308,22 +306,14 @@ template("efr32_sdk") {
308306
if (use_system_view) {
309307
_include_dirs += [
310308
"${efr32_sdk_root}/util/third_party/segger/systemview/SEGGER",
311-
"${efr32_sdk_root}/util/third_party/segger/systemview/Sample/FreeRTOSV10/Config/Cortex-M",
312-
"${efr32_sdk_root}/util/third_party/segger/systemview/Sample/FreeRTOSV10",
313309
"${efr32_sdk_root}/util/third_party/segger/systemview/Config/",
310+
"${efr32_sdk_root}/util/third_party/segger/systemview/init/",
311+
"${efr32_sdk_root}/util/third_party/segger/systemview/profiles/freertos_v10/",
314312
]
315313

316314
defines += [ "SL_SYSTEM_VIEW=1" ]
317315
}
318316

319-
if (silabs_board == "BRD2704A" || silabs_board == "BRD4318A") {
320-
_include_dirs += [
321-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/fem_util/",
322-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_rssi/",
323-
"${efr32_sdk_root}/platform/driver/debug/inc/",
324-
]
325-
}
326-
327317
defines += board_defines
328318

329319
if (use_wstk_leds) {
@@ -339,8 +329,6 @@ template("efr32_sdk") {
339329
if (enable_sleepy_device) {
340330
defines += [
341331
"CHIP_DEVICE_CONFIG_ENABLE_SED=1",
342-
"SL_CATALOG_POWER_MANAGER_PRESENT",
343-
"SL_CATALOG_SLEEPTIMER_PRESENT",
344332
"SL_OT_IDLE_INTERVAL=${sl_ot_idle_interval_ms}",
345333
"SL_OT_ACTIVE_INTERVAL=${sl_ot_active_interval_ms}",
346334
"SL_ACTIVE_MODE_THRESHOLD=${sl_active_mode_threshold}",
@@ -453,10 +441,13 @@ template("efr32_sdk") {
453441
} else if (silabs_family == "mgm24") {
454442
_include_dirs += [
455443
"${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Include",
444+
"${efr32_sdk_root}/platform/driver/debug/inc/",
456445
"${efr32_sdk_root}/platform/radio/rail_lib/chip/efr32/efr32xg2x",
457446
"${efr32_sdk_root}/platform/radio/rail_lib/protocol/ble",
458447
"${efr32_sdk_root}/platform/radio/rail_lib/protocol/ieee802154",
459448
"${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure",
449+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/fem_util/",
450+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_rssi/",
460451
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24",
461452
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24/config",
462453
"${efr32_sdk_root}/platform/service/device_init/config/s2/",
@@ -549,11 +540,13 @@ template("efr32_sdk") {
549540
"${chip_root}/third_party/mbedtls/repo/include/mbedtls/platform.h",
550541
"${efr32_sdk_root}/hardware/board/src/sl_board_control_gpio.c",
551542
"${efr32_sdk_root}/hardware/board/src/sl_board_init.c",
543+
"${efr32_sdk_root}/hardware/driver/configuration_over_swo/src/sl_cos.c",
552544
"${efr32_sdk_root}/platform/CMSIS/RTOS2/Source/os_systick.c",
553545
"${efr32_sdk_root}/platform/bootloader/api/btl_interface.c",
554546
"${efr32_sdk_root}/platform/bootloader/api/btl_interface_storage.c",
555547
"${efr32_sdk_root}/platform/bootloader/security/sha/crypto_sha.c",
556548
"${efr32_sdk_root}/platform/common/src/sl_slist.c",
549+
"${efr32_sdk_root}/platform/driver/debug/src/sl_debug_swo.c",
557550
"${efr32_sdk_root}/platform/emdrv/dmadrv/src/dmadrv.c",
558551
"${efr32_sdk_root}/platform/emdrv/gpiointerrupt/src/gpiointerrupt.c",
559552
"${efr32_sdk_root}/platform/emdrv/nvm3/src/nvm3_default.c",
@@ -627,6 +620,7 @@ template("efr32_sdk") {
627620
"${efr32_sdk_root}/util/third_party/freertos/kernel/croutine.c",
628621
"${efr32_sdk_root}/util/third_party/freertos/kernel/event_groups.c",
629622
"${efr32_sdk_root}/util/third_party/freertos/kernel/list.c",
623+
"${efr32_sdk_root}/util/third_party/freertos/kernel/portable/SiliconLabs/tick_power_manager.c",
630624
"${efr32_sdk_root}/util/third_party/freertos/kernel/queue.c",
631625
"${efr32_sdk_root}/util/third_party/freertos/kernel/stream_buffer.c",
632626
"${efr32_sdk_root}/util/third_party/freertos/kernel/tasks.c",
@@ -723,13 +717,6 @@ template("efr32_sdk") {
723717
]
724718
}
725719

726-
if (slc_generate || slc_reuse_files || silabs_family == "mgm24") {
727-
sources += [
728-
"${efr32_sdk_root}/hardware/driver/configuration_over_swo/src/sl_cos.c",
729-
"${efr32_sdk_root}/platform/driver/debug/src/sl_debug_swo.c",
730-
]
731-
}
732-
733720
if (silabs_family != "mgm24") {
734721
sources +=
735722
[ "${efr32_sdk_root}/platform/radio/rail_lib/hal/efr32/hal_efr.c" ]
@@ -763,8 +750,8 @@ template("efr32_sdk") {
763750
if (use_system_view) {
764751
sources += [
765752
"${efr32_sdk_root}/util/third_party/segger/systemview/SEGGER/SEGGER_SYSVIEW.c",
766-
"${efr32_sdk_root}/util/third_party/segger/systemview/Sample/FreeRTOSV10/Config/Cortex-M/SEGGER_SYSVIEW_Config_FreeRTOS.c",
767-
"${efr32_sdk_root}/util/third_party/segger/systemview/Sample/FreeRTOSV10/SEGGER_SYSVIEW_FreeRTOS.c",
753+
"${efr32_sdk_root}/util/third_party/segger/systemview/init/SEGGER_SYSVIEW_Init.c",
754+
"${efr32_sdk_root}/util/third_party/segger/systemview/profiles/freertos_v10/SEGGER_SYSVIEW_FreeRTOS.c",
768755
]
769756
}
770757

@@ -786,10 +773,6 @@ template("efr32_sdk") {
786773
]
787774
}
788775

789-
if (enable_sleepy_device) {
790-
sources += [ "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/SiliconLabs/tick_power_manager.c" ]
791-
}
792-
793776
if (defined(enable_fem)) {
794777
sources += [
795778
"${efr32_sdk_root}/util/plugin/plugin-common/fem-control/fem-control.c",
@@ -924,6 +907,7 @@ template("efr32_sdk") {
924907
"${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
925908
"${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
926909
"${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_dcdc_s2.c",
910+
"${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_dpll_s2.c",
927911
"${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_emu_s2.c",
928912
"${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_hfxo_s2.c",
929913
"${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_lfxo_s2.c",
@@ -935,6 +919,8 @@ template("efr32_sdk") {
935919
sources += [
936920
"${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Source/startup_mgm24.c",
937921
"${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Source/system_mgm24.c",
922+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/fem_util/sl_fem_util.c",
923+
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_rssi/sl_rail_util_rssi.c",
938924
"${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager.c",
939925
"${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_attestation.c",
940926
"${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_cipher.c",
@@ -962,6 +948,7 @@ template("efr32_sdk") {
962948
"${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
963949
"${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
964950
"${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_dcdc_s2.c",
951+
"${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_dpll_s2.c",
965952
"${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_emu_s2.c",
966953
"${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_hfxo_mgm24.c",
967954
"${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_lfxo_s2.c",
@@ -971,19 +958,6 @@ template("efr32_sdk") {
971958
]
972959
}
973960

974-
if (silabs_board == "BRD4186A" || silabs_board == "BRD4186C" ||
975-
silabs_board == "BRD4187A" || silabs_board == "BRD4187C" ||
976-
silabs_board == "BRD2704A") {
977-
sources += [ "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_dpll_s2.c" ]
978-
}
979-
980-
if (silabs_board == "BRD2704A" || silabs_board == "BRD4318A") {
981-
sources += [
982-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/fem_util/sl_fem_util.c",
983-
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_rssi/sl_rail_util_rssi.c",
984-
]
985-
}
986-
987961
public_deps = [
988962
":efr32_mbedtls_config",
989963
"${segger_rtt_root}:segger_rtt",

‎third_party/silabs/gecko_sdk

Submodule gecko_sdk updated 9039 files

‎third_party/silabs/matter_support

Submodule matter_support updated 717 files

0 commit comments

Comments
 (0)