[Silabs] Update matter_support remote to use new repository (#37363)

* Update matter_support remote

* Update matter_support to new hash

* Delete provisioning headers

* Rename variables, update gn paths and update header includes

* Update local matter_support

* Pull correct matter_sdk hash

* restyle

.gitmodules

@@ -207,7 +207,7 @@
 	platforms = mw320
 [submodule "third_party/silabs/matter_support"]
 	path = third_party/silabs/matter_support
-	url = https://github.com/SiliconLabs/sdk_support.git
+	url = https://github.com/SiliconLabsSoftware/matter_support.git
 	branch = main
 	platforms = silabs,silabs_docker
 [submodule "third_party/silabs/simplicity_sdk"]

examples/platform/silabs/BaseApplication.cpp

@@ -44,10 +44,10 @@
 #endif // ENABLE_CHIP_SHELL
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
-#include <ProvisionManager.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/util/attribute-storage.h>
 #include <assert.h>
+#include <headers/ProvisionManager.h>
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>

examples/platform/silabs/MatterConfig.cpp

@@ -53,10 +53,10 @@
 static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeystore;
 #endif
 
-#include <ProvisionManager.h>
 #include <app/InteractionModelEngine.h>
 #include <app/TimerDelegates.h>
 #include <data-model-providers/codegen/Instance.h>
+#include <headers/ProvisionManager.h>
 
 #ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
 #include "SilabsTestEventTriggerDelegate.h" // nogncheck

examples/platform/silabs/SiWx917/BUILD.gn

@@ -18,11 +18,15 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
 import("${chip_root}/examples/platform/silabs/args.gni")
 import("${chip_root}/src/lib/lib.gni")
 import("${chip_root}/src/platform/device.gni")
-import("${chip_root}/src/platform/silabs/provision/args.gni")
 import("${chip_root}/src/platform/silabs/wifi/args.gni")
 import("${chip_root}/third_party/silabs/silabs_board.gni")
 import("${silabs_sdk_build_root}/SiWx917_sdk.gni")
 
+import("${matter_support_root}/provision/args.gni")  # Seperate import since the
+                                                     # matter_support_root is
+                                                     # defined in the
+                                                     # ef32_sdk.gni
+
 declare_args() {
   enable_heap_monitoring = false
 
@@ -68,7 +72,7 @@ source_set("test-event-trigger") {
     "${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h",
   ]
 
-  deps = [ "${sl_provision_root}:provision-headers" ]
+  deps = [ "${sl_provision_root}:headers" ]
   public_configs = [ ":test-event-trigger-config" ]
   public_deps = [
     "${chip_root}/src/app:test-event-trigger",

examples/platform/silabs/SilabsTestEventTriggerDelegate.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "SilabsTestEventTriggerDelegate.h"
-#include <ProvisionManager.h>
+#include <headers/ProvisionManager.h>
 
 using namespace ::chip::DeviceLayer;
 

examples/platform/silabs/efr32/BUILD.gn

@@ -18,10 +18,13 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
 import("${chip_root}/src/app/icd/icd.gni")
 import("${chip_root}/src/lib/lib.gni")
 import("${chip_root}/src/platform/device.gni")
-import("${chip_root}/src/platform/silabs/provision/args.gni")
 import("${silabs_sdk_build_root}/efr32_sdk.gni")
 import("${silabs_sdk_build_root}/silabs_board.gni")
 
+import("${matter_support_root}/provision/args.gni")  # Seperate import since the
+                                                     # matter_support_root is
+                                                     # defined in the
+                                                     # ef32_sdk.gni
 declare_args() {
   enable_heap_monitoring = false
 
@@ -72,7 +75,7 @@ source_set("test-event-trigger") {
     "${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h",
   ]
 
-  deps = [ "${sl_provision_root}:provision-headers" ]
+  deps = [ "${sl_provision_root}:headers" ]
   public_configs = [ ":test-event-trigger-config" ]
   public_deps = [
     "${chip_root}/src/app:test-event-trigger",

examples/platform/silabs/provision/BUILD.gn

@@ -14,7 +14,6 @@
 
 import("//build_overrides/chip.gni")
 import("//build_overrides/efr32_sdk.gni")
-import("${chip_root}/src/platform/silabs/provision/args.gni")
 import("${silabs_sdk_build_root}/silabs_board.gni")
 
 if (wifi_soc) {
@@ -23,6 +22,8 @@ if (wifi_soc) {
   import("${silabs_sdk_build_root}/efr32_sdk.gni")
 }
 
+# Seperate import since the matter_support_root is defined in the ef32_sdk.gni / SiWx917_sdk.gni
+import("${matter_support_root}/provision/args.gni")
 source_set("storage") {
   sources = [ "ProvisionStorageCustom.cpp" ]
 
@@ -34,22 +35,22 @@ source_set("storage") {
 
   if (wifi_soc) {
     if (sl_si91x_crypto_flavor == "psa") {
-      libs =
-          [ "${sdk_support_root}/matter/provision/lib/libProvisionPSA_si917.a" ]
+      libs = [ "${sl_provision_root}/libs/libProvisionPSA_si917.a" ]
     } else {
-      libs = [ "${sdk_support_root}/matter/provision/lib/libProvision_si917.a" ]
+      libs = [ "${sl_provision_root}/libs/libProvision_si917.a" ]
     }
   } else {
     if (use_provision_flash_storage) {
-      libs = [ "${sdk_support_root}/matter/provision/lib/libProvisionFlash_${silabs_family}.a" ]
+      libs =
+          [ "${sl_provision_root}/libs/libProvisionFlash_${silabs_family}.a" ]
     } else {
-      libs = [ "${sdk_support_root}/matter/provision/lib/libProvision_${silabs_family}.a" ]
+      libs = [ "${sl_provision_root}/libs/libProvision_${silabs_family}.a" ]
     }
   }
 
   deps = [ "${chip_root}/src/lib" ]
 
-  public_deps = [ "${sl_provision_root}:provision-headers" ]
+  public_deps = [ "${sl_provision_root}:headers" ]
 
   if (sl_enable_test_event_trigger) {
     # Temporary workaround since we have duplicated configurations

examples/platform/silabs/provision/ProvisionStorageCustom.cpp

@@ -15,8 +15,8 @@
  *    limitations under the License.
  */
 #include <algorithm>
+#include <headers/ProvisionStorage.h>
 #include <lib/support/CodeUtils.h>
-#include <platform/silabs/provision/ProvisionStorage.h>
 #include <string.h>
 
 namespace chip {

examples/platform/silabs/provision/ProvisionStorageDefault.cpp

@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include "AttestationKey.h"
-#include "ProvisionStorage.h"
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <headers/AttestationKey.h>
+#include <headers/ProvisionStorage.h>
 #include <lib/support/BytesToHex.h>
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/CodeUtils.h>

examples/platform/silabs/provision/ProvisionStorageFlash.cpp

@@ -14,11 +14,11 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include "AttestationKey.h"
-#include "ProvisionEncoder.h"
-#include "ProvisionStorage.h"
 #include <algorithm>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <headers/AttestationKey.h>
+#include <headers/ProvisionEncoder.h>
+#include <headers/ProvisionStorage.h>
 #include <lib/core/CHIPEncoding.h>
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/CodeUtils.h>

examples/refrigerator-app/silabs/BUILD.gn

@@ -154,7 +154,7 @@ silabs_executable("refrigerator_app") {
       "${efr32_sdk_root}/platform/driver/i2cspm/src/sl_i2cspm.c",
       "${efr32_sdk_root}/platform/emlib/src/em_i2c.c",
       "${examples_common_plat_dir}/TemperatureSensor.cpp",
-      "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_i2cspm_init.c",
+      "${matter_support_root}/board-support/efr32/${silabs_family}/${silabs_board}/autogen/sl_i2cspm_init.c",
     ]
   }
 

scripts/examples/gn_silabs_example.sh

@@ -121,7 +121,7 @@ if [ "$#" == "0" ]; then
             (default: /third_party/silabs/slc_gen/<board>/)
         sl_pre_gen_path
             Allow users to define a path to pre-generated board files
-            (default: /third_party/silabs/matter_support/matter/<family>/<board>/)
+            (default: third_party/silabs/matter_support/board-support/<family>/<board>/)
         sl_matter_version
             Use provided software version at build time
         sl_matter_version_str
@@ -379,7 +379,7 @@ else
         fi
 
         # search bootloader directory for the respective bootloaders for the input board
-        bootloaderFiles=("$(find "$MATTER_ROOT/third_party/silabs/matter_support/matter/efr32/bootloader_binaries/" -maxdepth 1 -name "*$SILABS_BOARD*" | tr '\n' ' ')")
+        bootloaderFiles=("$(find "$MATTER_ROOT/third_party/silabs/matter_support/board-support/efr32/bootloader_binaries/" -maxdepth 1 -name "*$SILABS_BOARD*" | tr '\n' ' ')")
 
         if [ "${#bootloaderFiles[@]}" -gt 1 ]; then
             for i in "${!bootloaderFiles[@]}"; do

src/platform/silabs/SiWx917/BUILD.gn

@@ -18,10 +18,10 @@ import("${chip_root}/src/platform/device.gni")
 
 import("${chip_root}/build/chip/buildconfig_header.gni")
 import("${chip_root}/src/crypto/crypto.gni")
-import("${chip_root}/src/platform/silabs/provision/args.gni")
 import("${chip_root}/src/platform/silabs/wifi/args.gni")
 import("${chip_root}/third_party/silabs/SiWx917_sdk.gni")
 import("${chip_root}/third_party/silabs/silabs_board.gni")
+import("${matter_support_root}/provision/args.gni")
 
 silabs_platform_dir = "${chip_root}/src/platform/silabs"
 
@@ -90,7 +90,7 @@ static_library("SiWx917") {
   ]
   deps = [
     "${chip_root}/src/platform/logging:headers",
-    "${sl_provision_root}:provision-headers",
+    "${sl_provision_root}:headers",
   ]
 
   # Add platform crypto implementation

src/platform/silabs/efr32/BLEManagerImpl.cpp

@@ -52,8 +52,8 @@ extern "C" {
 #include <setup_payload/AdditionalDataPayloadGenerator.h>
 #endif
 
-#include <ProvisionChannel.h>
-#include <ProvisionManager.h>
+#include <headers/ProvisionChannel.h>
+#include <headers/ProvisionManager.h>
 
 using namespace ::chip;
 using namespace ::chip::Ble;

src/platform/silabs/efr32/BUILD.gn

@@ -17,9 +17,9 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/build/chip/buildconfig_header.gni")
 import("${chip_root}/src/crypto/crypto.gni")
 import("${chip_root}/src/platform/device.gni")
-import("${chip_root}/src/platform/silabs/provision/args.gni")
 import("${chip_root}/third_party/silabs/efr32_sdk.gni")
 import("${chip_root}/third_party/silabs/silabs_board.gni")
+import("${matter_support_root}/provision/args.gni")
 
 assert(chip_device_platform == "efr32")
 
@@ -115,7 +115,7 @@ static_library("efr32") {
     "${chip_root}/src/platform:platform_base",
     "${chip_root}/src/platform/logging:headers",
   ]
-  deps = [ "${sl_provision_root}:provision-headers" ]
+  deps = [ "${sl_provision_root}:headers" ]
   public_configs = []
 
   # Add platform crypto implementation

src/platform/silabs/multi-ota/OTAFactoryDataProcessor.h

@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <ProvisionManager.h>
-#include <ProvisionStorage.h>
+#include <headers/ProvisionManager.h>
+#include <headers/ProvisionStorage.h>
 #include <lib/core/Optional.h>
 #include <lib/support/ScopedBuffer.h>
 #include <lib/support/Span.h>