apply suggested renames

Author: jmartinez-silabs

examples/platform/silabs/SiWx917/BUILD.gn

@@ -171,7 +171,7 @@ config("silabs-wifi-config") {
 }
 
 source_set("siwx917-common") {
-  deps = [ "${silabs_common_plat_dir}/provision:provision-storage" ]
+  deps = [ "${silabs_common_plat_dir}/provision:storage" ]
   defines = []
   public_deps = []
   public_configs = [

examples/platform/silabs/efr32/BUILD.gn

@@ -209,7 +209,7 @@ config("silabs-wifi-config") {
 }
 
 source_set("efr32-common") {
-  deps = [ "${silabs_common_plat_dir}/provision:provision-storage" ]
+  deps = [ "${silabs_common_plat_dir}/provision:storage" ]
   defines = []
   public_deps = []
   public_configs = [

examples/platform/silabs/provision/BUILD.gn

@@ -22,10 +22,10 @@ if (wifi_soc) {
   import("${efr32_sdk_build_root}/efr32_sdk.gni")
 }
 
-source_set("provision-storage") {
+source_set("storage") {
   sources = [ "ProvisionStorageCustom.cpp" ]
 
-  if (use_flash_storage) {
+  if (use_provision_flash_storage) {
     sources += [ "ProvisionStorageFlash.cpp" ]
   } else {
     sources += [ "ProvisionStorageDefault.cpp" ]
@@ -39,7 +39,7 @@ source_set("provision-storage") {
       libs = [ "${sdk_support_root}/matter/provision/lib/libProvision_si917.a" ]
     }
   } else {
-    if (use_flash_storage) {
+    if (use_provision_flash_storage) {
       libs = [ "${sdk_support_root}/matter/provision/lib/libProvisionFlash_${silabs_family}.a" ]
     } else {
       libs = [ "${sdk_support_root}/matter/provision/lib/libProvision_${silabs_family}.a" ]

src/platform/silabs/efr32/efr32-chip-mbedtls-config.h

@@ -87,11 +87,11 @@
 #define PSA_WANT_ALG_SOME_PAKE
 #endif // SL_USE_COAP_CONFIG
 
-#if SL_PROVISION_FLASH
+#if SL_MATTER_PROVISION_FLASH
 #define MBEDTLS_SHA256_C
 #define MBEDTLS_HMAC_DRBG_C
 #define MBEDTLS_ECDSA_DETERMINISTIC
-#endif
+#endif // SL_MATTER_PROVISION_FLASH
 
 #define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
 

third_party/silabs/efr32_sdk.gni

@@ -84,7 +84,7 @@ declare_args() {
   chip_enable_ota_custom_tlv_testing = false
 
   # Factory Provision storage
-  use_flash_storage = wifi_soc
+  use_provision_flash_storage = wifi_soc
 }
 
 examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
@@ -472,10 +472,10 @@ template("efr32_sdk") {
       defines += [ "SL_USE_COAP_CONFIG=0" ]
     }
 
-    if (use_flash_storage) {
-      defines += [ "SL_PROVISION_FLASH=1" ]
+    if (use_provision_flash_storage) {
+      defines += [ "SL_MATTER_PROVISION_FLASH=1" ]
     } else {
-      defines += [ "SL_PROVISION_FLASH=0" ]
+      defines += [ "SL_MATTER_PROVISION_FLASH=0" ]
     }
 
     if (chip_enable_ble_rs911x) {