Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Silabs] Update matter support submodule pointer #33374

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ class DeviceAttestationCredsSilabs : public DeviceAttestationCredentialsProvider
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))
Expand Down
9 changes: 6 additions & 3 deletions third_party/silabs/efr32_sdk.gni
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,6 @@ template("efr32_sdk") {
"${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",
Expand All @@ -214,6 +212,9 @@ template("efr32_sdk") {
"${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}",
]
Expand Down Expand Up @@ -684,7 +685,6 @@ template("efr32_sdk") {
"${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",
Expand Down Expand Up @@ -783,6 +783,9 @@ template("efr32_sdk") {
"${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 += [
Expand Down
2 changes: 1 addition & 1 deletion third_party/silabs/matter_support
Submodule matter_support updated 34 files
+2 −2 matter/efr32/efr32mg12/BRD4161A/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg12/BRD4162A/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg12/BRD4163A/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg12/BRD4164A/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg12/BRD4166A/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg12/BRD4170A/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg12/BRD4304A/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg24/BRD2601B/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg24/BRD2703A/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg24/BRD4186A/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg24/BRD4186C/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg24/BRD4187A/config/psa_crypto_config.h
+2 −2 matter/efr32/efr32mg24/BRD4187C/config/psa_crypto_config.h
+2 −2 matter/efr32/mgm24/BRD2704A/config/psa_crypto_config.h
+2 −2 matter/efr32/mgm24/BRD4316A/config/psa_crypto_config.h
+2 −2 matter/efr32/mgm24/BRD4317A/config/psa_crypto_config.h
+2 −2 matter/efr32/mgm24/BRD4318A/config/psa_crypto_config.h
+2 −2 matter/efr32/mgm24/BRD4319A/config/psa_crypto_config.h
+80 −0 platform/security/sl_component/sl_mbedtls_support/inc/aes_alt.h
+69 −0 platform/security/sl_component/sl_mbedtls_support/inc/ccm_alt.h
+78 −0 platform/security/sl_component/sl_mbedtls_support/inc/cmac_alt.h
+88 −0 platform/security/sl_component/sl_mbedtls_support/inc/ecjpake_alt.h
+121 −0 platform/security/sl_component/sl_mbedtls_support/inc/gcm_alt.h
+89 −0 platform/security/sl_component/sl_mbedtls_support/inc/se_management.h
+82 −0 platform/security/sl_component/sl_mbedtls_support/inc/sha1_alt.h
+84 −0 platform/security/sl_component/sl_mbedtls_support/inc/sha256_alt.h
+78 −0 platform/security/sl_component/sl_mbedtls_support/inc/sha512_alt.h
+191 −0 platform/security/sl_component/sl_mbedtls_support/inc/sl_entropy_adc.h
+42 −0 platform/security/sl_component/sl_mbedtls_support/inc/sl_mbedtls.h
+120 −0 platform/security/sl_component/sl_mbedtls_support/inc/sl_psa_crypto.h
+206 −0 platform/security/sl_component/sl_mbedtls_support/inc/sl_psa_values.h
+153 −0 platform/security/sl_component/sl_mbedtls_support/inc/sli_psa_crypto.h
+234 −0 platform/security/sl_component/sl_mbedtls_support/inc/threading_alt.h
+3,265 −0 platform/security/sl_component/sl_psa_driver/src/sl_psa_its_nvm3.c
Loading