[Silabs] Update matter support submodule pointer (#33374)
* Update submodule pointer
* Update file paths to pull matter support files
* Fix offset calculation
diff --git a/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp b/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp
index 810529c..6078541 100644
--- a/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp
+++ b/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp
@@ -138,13 +138,13 @@
uint32_t size = size_default;
ReturnErrorOnFailure(SilabsConfig::ReadConfigValue(SilabsConfig::kConfigKey_Creds_Base_Addr, base_addr));
- address = (uint8_t *) (base_addr + offset);
// Offset
if (SilabsConfig::ConfigValueExists(offset_key))
{
ReturnErrorOnFailure(SilabsConfig::ReadConfigValue(offset_key, offset));
}
+ address = (uint8_t *) (base_addr + offset);
// Size
if (SilabsConfig::ConfigValueExists(size_key))
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index 5bb2ff3..8b1ae3e 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -201,8 +201,6 @@
"${efr32_sdk_root}/util/third_party/mbedtls/include/psa",
"${efr32_sdk_root}/util/third_party/mbedtls/library",
"${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src",
- "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/inc",
- "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src",
"${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/config/",
"${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/config/preset",
"${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/inc",
@@ -214,6 +212,9 @@
"${silabs_gen_folder}/config",
"${silabs_gen_folder}/autogen",
+ # Use directory in matter support until gsdk files are updated
+ "${sdk_support_root}/platform/security/sl_component/sl_mbedtls_support/inc",
+
# Headers needed for Init no function will be called if OT is not used
"${sl_ot_efr32_root}",
]
@@ -684,7 +685,6 @@
"${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/sl_entropy_hardware.c",
"${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/sl_mbedtls.c",
"${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/sli_psa_crypto.c",
- "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sl_psa_its_nvm3.c",
"${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_psa_driver_common.c",
"${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_psa_driver_init.c",
"${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_psa_trng.c",
@@ -783,6 +783,9 @@
"${silabs_gen_folder}/autogen/sl_device_init_clocks.c",
"${silabs_gen_folder}/autogen/sl_event_handler.c",
"${silabs_gen_folder}/autogen/sl_iostream_handles.c",
+
+ # Used file in matter_support until fix is pushed to gsdk
+ "${sdk_support_root}/platform/security/sl_component/sl_psa_driver/src/sl_psa_its_nvm3.c",
]
if (enable_dic) {
sources += [
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
index 56d4d4e..edbfeba 160000
--- a/third_party/silabs/matter_support
+++ b/third_party/silabs/matter_support
@@ -1 +1 @@
-Subproject commit 56d4d4ec0dea032302f52632c15d4d7813f8e9f5
+Subproject commit edbfeba723c9ffdc93f57ad1eee85186b1643f25
