[Silabs] Folder structure introduction for addition of SiWx917 (#23736)

* src/platform/silabs folder changes * examples/lighting-app and examples/platform folder modification for silabs/efr32 * Skeleton for the SiWx917 folder * CI fix for the lighting app due to modified folder structure * Revert "Skeleton for the SiWx917 folder" This reverts commit bbe322d. * Build changes for different applications * Restyle PR * Fixing the build failures * fixing the lock app * updating the dry run efr32 for the new folder structure] * Added a variable for the BUILD.gn file * restyle the last commit * src/platform/silabs folder changes * examples/lighting-app and examples/platform folder modification for silabs/efr32 * Skeleton for the SiWx917 folder * CI fix for the lighting app due to modified folder structure * Revert "Skeleton for the SiWx917 folder" This reverts commit bbe322d. * Build changes for different applications * Restyle PR * Fixing the build failures * fixing the lock app * updating the dry run efr32 for the new folder structure] * Added a variable for the BUILD.gn file * restyle the last commit
project-chip · Nov 24, 2022 · 64252c8 · 64252c8
1 parent 7f1b4b8
commit 64252c8
Show file tree

Hide file tree

Showing 167 changed files with 141 additions and 129 deletions.
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -101,7 +101,7 @@ jobs:
       - name: Build example EFR32 Lighting App for BRD4161A with RPCs
         timeout-minutes: 15
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_debug_rpc BRD4161A "is_debug=false" \
+          scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_debug_rpc BRD4161A "is_debug=false" \
             disable_lcd=true 'import("//with_pw_rpc.gni")'
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rpc lighting-app \
             out/lighting_app_debug_rpc/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
@@ -118,7 +118,7 @@ jobs:
       - name: Build example EFR32+RS911x WiFi Lighting app for BRD4161A
         timeout-minutes: 15
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_wifi_rs911x BRD4161A --wifi rs911x
+          scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_wifi_rs911x BRD4161A --wifi rs911x
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rs911x lighting-app \
             out/lighting_app_wifi_rs911x/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
       - name: Clean out build output

diff --git a/config/efr32/lib/pw_rpc/BUILD.gn b/config/efr32/lib/pw_rpc/BUILD.gn
@@ -24,7 +24,7 @@ static_library("pw_rpc") {
   public_deps = [
     "$dir_pw_rpc:server",
     "$dir_pw_rpc/nanopb:echo_service",
-    "${chip_root}/examples/platform/efr32/pw_sys_io:pw_sys_io_efr32",
+    "${chip_root}/examples/platform/silabs/efr32/pw_sys_io:pw_sys_io_efr32",
     "${dir_pigweed}/pw_hdlc:pw_rpc",
     dir_pw_assert,
     dir_pw_checksum,

diff --git a/config/efr32/lib/pw_rpc/pw_rpc.gni b/config/efr32/lib/pw_rpc/pw_rpc.gni
@@ -18,7 +18,7 @@ import("//build_overrides/pigweed.gni")
 pw_log_BACKEND = "$dir_pw_log_basic"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 pw_sys_io_BACKEND =
-    "${chip_root}/examples/platform/efr32/pw_sys_io:pw_sys_io_efr32"
+    "${chip_root}/examples/platform/silabs/efr32/pw_sys_io:pw_sys_io_efr32"
 
 pw_build_LINK_DEPS = [
   "$dir_pw_assert:impl",

diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
@@ -32,7 +32,8 @@ if (chip_enable_pw_rpc) {
 assert(current_os == "freertos")
 
 efr32_project_dir = "${chip_root}/examples/light-switch-app/efr32"
-examples_plat_dir = "${chip_root}/examples/platform/efr32"
+examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
+examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 declare_args() {
   # Dump memory usage at link time.
@@ -79,7 +80,7 @@ assert(!(use_wf200 && chip_enable_openthread))
 if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
   enable_openthread_cli = false
-  import("${chip_root}/src/platform/EFR32/wifi_args.gni")
+  import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
 }
 
 # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD)
@@ -91,7 +92,7 @@ if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" ||
 
 # WiFi settings
 if (chip_enable_wifi) {
-  wifi_sdk_dir = "${chip_root}/src/platform/EFR32/wifi"
+  wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi"
   efr32_lwip_defs = [ "LWIP_NETIF_API=1" ]
   if (lwip_ipv4) {
     efr32_lwip_defs += [
@@ -132,10 +133,11 @@ efr32_sdk("sdk") {
   ]
 
   include_dirs = [
-    "${chip_root}/src/platform/EFR32",
+    "${chip_root}/src/platform/silabs/EFR32",
     "${efr32_project_dir}/include",
     "${examples_plat_dir}",
     "${chip_root}/src/lib",
+    "${examples_common_plat_dir}",
   ]
 
   defines = [
@@ -183,9 +185,9 @@ efr32_executable("light_switch_app") {
   defines = []
 
   sources = [
+    "${examples_common_plat_dir}/heap_4_silabs.c",
     "${examples_plat_dir}/BaseApplication.cpp",
     "${examples_plat_dir}/efr32_utils.cpp",
-    "${examples_plat_dir}/heap_4_silabs.c",
     "${examples_plat_dir}/init_efrPlatform.cpp",
     "${examples_plat_dir}/matter_config.cpp",
     "src/AppTask.cpp",
@@ -302,8 +304,8 @@ efr32_executable("light_switch_app") {
     sources += [
       "${chip_root}/examples/common/pigweed/RpcService.cpp",
       "${chip_root}/examples/common/pigweed/efr32/PigweedLoggerMutex.cpp",
-      "${examples_plat_dir}/PigweedLogger.cpp",
-      "${examples_plat_dir}/Rpc.cpp",
+      "${examples_common_plat_dir}/PigweedLogger.cpp",
+      "${examples_common_plat_dir}/Rpc.cpp",
     ]
 
     deps += [
@@ -327,7 +329,7 @@ efr32_executable("light_switch_app") {
   }
 
   if (enable_heap_monitoring) {
-    sources += [ "${examples_plat_dir}/MemMonitoring.cpp" ]
+    sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ]
     defines += [ "HEAP_MONITORING" ]
   }
 

diff --git a/examples/light-switch-app/efr32/args.gni b/examples/light-switch-app/efr32/args.gni
@@ -15,7 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
 import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/src/platform/EFR32/args.gni")
+import("${chip_root}/src/platform/silabs/EFR32/args.gni")
 
 efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 

diff --git a/examples/light-switch-app/efr32/build_for_wifi_args.gni b/examples/light-switch-app/efr32/build_for_wifi_args.gni
@@ -17,7 +17,7 @@ import("${chip_root}/config/standalone/args.gni")
 
 efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 chip_enable_openthread = false
-import("${chip_root}/src/platform/EFR32/wifi_args.gni")
+import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
 
 chip_enable_ota_requestor = true
 

diff --git a/examples/lighting-app/efr32/build_overrides b/examples/lighting-app/efr32/build_overrides
diff --git a/examples/lighting-app/efr32/third_party/connectedhomeip b/examples/lighting-app/efr32/third_party/connectedhomeip
diff --git a/examples/lighting-app/efr32/.gn → examples/lighting-app/silabs/efr32/.gn b/examples/lighting-app/efr32/.gn → examples/lighting-app/silabs/efr32/.gn
diff --git a/examples/lighting-app/efr32/BUILD.gn → examples/lighting-app/silabs/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn → examples/lighting-app/silabs/efr32/BUILD.gn
@@ -31,8 +31,9 @@ if (chip_enable_pw_rpc) {
 
 assert(current_os == "freertos")
 
-efr32_project_dir = "${chip_root}/examples/lighting-app/efr32"
-examples_plat_dir = "${chip_root}/examples/platform/efr32"
+efr32_project_dir = "${chip_root}/examples/lighting-app/silabs/efr32"
+examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
+examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 declare_args() {
   # Dump memory usage at link time.
@@ -79,7 +80,7 @@ assert(!(use_wf200 && chip_enable_openthread))
 if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
   enable_openthread_cli = false
-  import("${chip_root}/src/platform/EFR32/wifi_args.gni")
+  import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
 }
 
 # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD)
@@ -96,7 +97,7 @@ if (chip_enable_wifi) {
     show_qr_code = false
     disable_lcd = true
   }
-  wifi_sdk_dir = "${chip_root}/src/platform/EFR32/wifi"
+  wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi"
   efr32_lwip_defs = [ "LWIP_NETIF_API=1" ]
   if (lwip_ipv4) {
     efr32_lwip_defs += [
@@ -137,10 +138,11 @@ efr32_sdk("sdk") {
   ]
 
   include_dirs = [
-    "${chip_root}/src/platform/EFR32",
+    "${chip_root}/src/platform/silabs/EFR32",
     "${efr32_project_dir}/include",
     "${examples_plat_dir}",
     "${chip_root}/src/lib",
+    "${examples_common_plat_dir}",
   ]
 
   defines = [
@@ -192,9 +194,9 @@ efr32_executable("lighting_app") {
   defines = []
 
   sources = [
+    "${examples_common_plat_dir}/heap_4_silabs.c",
     "${examples_plat_dir}/BaseApplication.cpp",
     "${examples_plat_dir}/efr32_utils.cpp",
-    "${examples_plat_dir}/heap_4_silabs.c",
     "${examples_plat_dir}/init_efrPlatform.cpp",
     "${examples_plat_dir}/matter_config.cpp",
     "src/AppTask.cpp",
@@ -306,8 +308,8 @@ efr32_executable("lighting_app") {
     sources += [
       "${chip_root}/examples/common/pigweed/RpcService.cpp",
       "${chip_root}/examples/common/pigweed/efr32/PigweedLoggerMutex.cpp",
-      "${examples_plat_dir}/PigweedLogger.cpp",
-      "${examples_plat_dir}/Rpc.cpp",
+      "${examples_common_plat_dir}/PigweedLogger.cpp",
+      "${examples_common_plat_dir}/Rpc.cpp",
     ]
 
     deps += [
@@ -336,7 +338,7 @@ efr32_executable("lighting_app") {
   }
 
   if (enable_heap_monitoring) {
-    sources += [ "${examples_plat_dir}/MemMonitoring.cpp" ]
+    sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ]
     defines += [ "HEAP_MONITORING" ]
   }
 

diff --git a/examples/lighting-app/efr32/README.md → examples/lighting-app/silabs/efr32/README.md b/examples/lighting-app/efr32/README.md → examples/lighting-app/silabs/efr32/README.md
diff --git a/examples/lighting-app/efr32/args.gni → examples/lighting-app/silabs/efr32/args.gni b/examples/lighting-app/efr32/args.gni → examples/lighting-app/silabs/efr32/args.gni
@@ -15,7 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
 import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/src/platform/EFR32/args.gni")
+import("${chip_root}/src/platform/silabs/EFR32/args.gni")
 
 efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 

diff --git a/...ighting-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni b/...ighting-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni
@@ -17,7 +17,7 @@ import("${chip_root}/config/standalone/args.gni")
 
 efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 chip_enable_openthread = false
-import("${chip_root}/src/platform/EFR32/wifi_args.gni")
+import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
 
 chip_enable_ota_requestor = true
 

diff --git a/...ghting-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn b/...ghting-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn
diff --git a/examples/lighting-app/silabs/efr32/build_overrides b/examples/lighting-app/silabs/efr32/build_overrides
@@ -0,0 +1 @@
+../../../build_overrides
diff --git a/...es/lighting-app/efr32/include/AppConfig.h → ...ting-app/silabs/efr32/include/AppConfig.h b/...es/lighting-app/efr32/include/AppConfig.h → ...ting-app/silabs/efr32/include/AppConfig.h
diff --git a/...les/lighting-app/efr32/include/AppEvent.h → ...hting-app/silabs/efr32/include/AppEvent.h b/...les/lighting-app/efr32/include/AppEvent.h → ...hting-app/silabs/efr32/include/AppEvent.h
diff --git a/...ples/lighting-app/efr32/include/AppTask.h → ...ghting-app/silabs/efr32/include/AppTask.h b/...ples/lighting-app/efr32/include/AppTask.h → ...ghting-app/silabs/efr32/include/AppTask.h
diff --git a/...ing-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h b/...ing-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h
diff --git a/...hting-app/efr32/include/LightingManager.h → ...pp/silabs/efr32/include/LightingManager.h b/...hting-app/efr32/include/LightingManager.h → ...pp/silabs/efr32/include/LightingManager.h
diff --git a/examples/lighting-app/efr32/src/AppTask.cpp → ...lighting-app/silabs/efr32/src/AppTask.cpp b/examples/lighting-app/efr32/src/AppTask.cpp → ...lighting-app/silabs/efr32/src/AppTask.cpp
diff --git a/...ighting-app/efr32/src/LightingManager.cpp → ...-app/silabs/efr32/src/LightingManager.cpp b/...ighting-app/efr32/src/LightingManager.cpp → ...-app/silabs/efr32/src/LightingManager.cpp
diff --git a/...s/lighting-app/efr32/src/ZclCallbacks.cpp → ...ing-app/silabs/efr32/src/ZclCallbacks.cpp b/...s/lighting-app/efr32/src/ZclCallbacks.cpp → ...ing-app/silabs/efr32/src/ZclCallbacks.cpp
diff --git a/examples/lighting-app/efr32/src/main.cpp → ...es/lighting-app/silabs/efr32/src/main.cpp b/examples/lighting-app/efr32/src/main.cpp → ...es/lighting-app/silabs/efr32/src/main.cpp
diff --git a/examples/lighting-app/silabs/efr32/third_party/connectedhomeip b/examples/lighting-app/silabs/efr32/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../..
diff --git a/examples/lighting-app/efr32/with_pw_rpc.gni → ...lighting-app/silabs/efr32/with_pw_rpc.gni b/examples/lighting-app/efr32/with_pw_rpc.gni → ...lighting-app/silabs/efr32/with_pw_rpc.gni
@@ -17,7 +17,7 @@
 
 import("//build_overrides/chip.gni")
 import("${chip_root}/config/efr32/lib/pw_rpc/pw_rpc.gni")
-import("${chip_root}/examples/platform/efr32/args.gni")
+import("${chip_root}/examples/platform/silabs/efr32/args.gni")
 
 efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 

diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -32,7 +32,8 @@ if (chip_enable_pw_rpc) {
 assert(current_os == "freertos")
 
 efr32_project_dir = "${chip_root}/examples/lock-app/efr32"
-examples_plat_dir = "${chip_root}/examples/platform/efr32"
+examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
+examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 declare_args() {
   # Dump memory usage at link time.
@@ -79,7 +80,7 @@ assert(!(use_wf200 && chip_enable_openthread))
 if (chip_enable_wifi) {
   assert(use_rs911x || use_wf200)
   enable_openthread_cli = false
-  import("${chip_root}/src/platform/EFR32/wifi_args.gni")
+  import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
 }
 
 # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD)
@@ -91,7 +92,7 @@ if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" ||
 
 # WiFi settings
 if (chip_enable_wifi) {
-  wifi_sdk_dir = "${chip_root}/src/platform/EFR32/wifi"
+  wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi"
   efr32_lwip_defs = [ "LWIP_NETIF_API=1" ]
   if (lwip_ipv4) {
     efr32_lwip_defs += [
@@ -132,10 +133,11 @@ efr32_sdk("sdk") {
   ]
 
   include_dirs = [
-    "${chip_root}/src/platform/EFR32",
+    "${chip_root}/src/platform/silabs/EFR32",
     "${efr32_project_dir}/include",
     "${examples_plat_dir}",
     "${chip_root}/src/lib",
+    "${examples_common_plat_dir}",
   ]
 
   defines = [
@@ -182,9 +184,9 @@ efr32_executable("lock_app") {
   defines = []
 
   sources = [
+    "${examples_common_plat_dir}/heap_4_silabs.c",
     "${examples_plat_dir}/BaseApplication.cpp",
     "${examples_plat_dir}/efr32_utils.cpp",
-    "${examples_plat_dir}/heap_4_silabs.c",
     "${examples_plat_dir}/init_efrPlatform.cpp",
     "${examples_plat_dir}/matter_config.cpp",
     "src/AppTask.cpp",
@@ -300,8 +302,8 @@ efr32_executable("lock_app") {
     sources += [
       "${chip_root}/examples/common/pigweed/RpcService.cpp",
       "${chip_root}/examples/common/pigweed/efr32/PigweedLoggerMutex.cpp",
-      "${examples_plat_dir}/PigweedLogger.cpp",
-      "${examples_plat_dir}/Rpc.cpp",
+      "${examples_common_plat_dir}/PigweedLogger.cpp",
+      "${examples_common_plat_dir}/Rpc.cpp",
     ]
 
     deps += [
@@ -327,7 +329,7 @@ efr32_executable("lock_app") {
   }
 
   if (enable_heap_monitoring) {
-    sources += [ "${examples_plat_dir}/MemMonitoring.cpp" ]
+    sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ]
     defines += [ "HEAP_MONITORING" ]
   }
 

diff --git a/examples/lock-app/efr32/args.gni b/examples/lock-app/efr32/args.gni
@@ -15,7 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
 import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/src/platform/EFR32/args.gni")
+import("${chip_root}/src/platform/silabs/EFR32/args.gni")
 
 efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 

diff --git a/examples/lock-app/efr32/build_for_wifi_args.gni b/examples/lock-app/efr32/build_for_wifi_args.gni
@@ -17,7 +17,7 @@ import("${chip_root}/config/standalone/args.gni")
 
 efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 chip_enable_openthread = false
-import("${chip_root}/src/platform/EFR32/wifi_args.gni")
+import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
 
 chip_enable_ota_requestor = true
 

diff --git a/examples/lock-app/efr32/with_pw_rpc.gni b/examples/lock-app/efr32/with_pw_rpc.gni
@@ -17,7 +17,7 @@
 
 import("//build_overrides/chip.gni")
 import("${chip_root}/config/efr32/lib/pw_rpc/pw_rpc.gni")
-import("${chip_root}/examples/platform/efr32/args.gni")
+import("${chip_root}/examples/platform/silabs/efr32/args.gni")
 
 efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 

diff --git a/examples/persistent-storage/efr32/main.cpp b/examples/persistent-storage/efr32/main.cpp
@@ -32,8 +32,8 @@
 #include "init_efrPlatform.h"
 #include "sl_system_kernel.h"
 #include <platform/CHIPDeviceLayer.h>
-#include <platform/EFR32/EFR32Config.h>
 #include <platform/KeyValueStoreManager.h>
+#include <platform/silabs/EFR32Config.h>
 
 static TaskHandle_t sTestTaskHandle;
 void TestTask(void * pvParameter)

diff --git a/...orm/efr32/EFR32DeviceAttestationCreds.cpp → ...rm/silabs/EFR32DeviceAttestationCreds.cpp b/...orm/efr32/EFR32DeviceAttestationCreds.cpp → ...rm/silabs/EFR32DeviceAttestationCreds.cpp
diff --git a/...tform/efr32/EFR32DeviceAttestationCreds.h → ...form/silabs/EFR32DeviceAttestationCreds.h b/...tform/efr32/EFR32DeviceAttestationCreds.h → ...form/silabs/EFR32DeviceAttestationCreds.h
diff --git a/examples/platform/efr32/MemMonitoring.h → examples/platform/silabs/MemMonitoring.h b/examples/platform/efr32/MemMonitoring.h → examples/platform/silabs/MemMonitoring.h
diff --git a/examples/platform/efr32/PigweedLogger.cpp → examples/platform/silabs/PigweedLogger.cpp b/examples/platform/efr32/PigweedLogger.cpp → examples/platform/silabs/PigweedLogger.cpp
diff --git a/examples/platform/efr32/PigweedLogger.h → examples/platform/silabs/PigweedLogger.h b/examples/platform/efr32/PigweedLogger.h → examples/platform/silabs/PigweedLogger.h
diff --git a/examples/platform/efr32/Rpc.cpp → examples/platform/silabs/Rpc.cpp b/examples/platform/efr32/Rpc.cpp → examples/platform/silabs/Rpc.cpp
diff --git a/examples/platform/efr32/Rpc.h → examples/platform/silabs/Rpc.h b/examples/platform/efr32/Rpc.h → examples/platform/silabs/Rpc.h
diff --git a/examples/platform/efr32/BUILD.gn → examples/platform/silabs/efr32/BUILD.gn b/examples/platform/efr32/BUILD.gn → examples/platform/silabs/efr32/BUILD.gn
@@ -82,8 +82,8 @@ config("attestation-credentials-config") {
 
 source_set("efr32-attestation-credentials") {
   sources = [
-    "EFR32DeviceAttestationCreds.cpp",
-    "EFR32DeviceAttestationCreds.h",
+    "../EFR32DeviceAttestationCreds.cpp",
+    "../EFR32DeviceAttestationCreds.h",
   ]
 
   public_deps = [

diff --git a/examples/platform/efr32/BaseApplication.cpp → ...platform/silabs/efr32/BaseApplication.cpp b/examples/platform/efr32/BaseApplication.cpp → ...platform/silabs/efr32/BaseApplication.cpp
@@ -51,15 +51,15 @@
 #include <setup_payload/SetupPayload.h>
 
 #if CHIP_ENABLE_OPENTHREAD
-#include <platform/EFR32/ThreadStackManagerImpl.h>
 #include <platform/OpenThread/OpenThreadUtils.h>
 #include <platform/ThreadStackManager.h>
+#include <platform/silabs/ThreadStackManagerImpl.h>
 #endif // CHIP_ENABLE_OPENTHREAD
 
 #ifdef SL_WIFI
 #include "wfx_host_events.h"
 #include <app/clusters/network-commissioning/network-commissioning.h>
-#include <platform/EFR32/NetworkCommissioningWiFiDriver.h>
+#include <platform/silabs/NetworkCommissioningWiFiDriver.h>
 #endif // SL_WIFI
 
 /**********************************************************

diff --git a/examples/platform/efr32/BaseApplication.h → ...s/platform/silabs/efr32/BaseApplication.h b/examples/platform/efr32/BaseApplication.h → ...s/platform/silabs/efr32/BaseApplication.h
diff --git a/...latform/efr32/EFR32DeviceDataProvider.cpp → .../silabs/efr32/EFR32DeviceDataProvider.cpp b/...latform/efr32/EFR32DeviceDataProvider.cpp → .../silabs/efr32/EFR32DeviceDataProvider.cpp
@@ -16,9 +16,9 @@
  */
 
 #include "EFR32DeviceDataProvider.h"
-#include "EFR32Config.h"
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/support/Base64.h>
+#include <platform/silabs/EFR32Config.h>
 #include <setup_payload/Base38Encode.h>
 #include <setup_payload/SetupPayload.h>
 

diff --git a/.../platform/efr32/EFR32DeviceDataProvider.h → ...rm/silabs/efr32/EFR32DeviceDataProvider.h b/.../platform/efr32/EFR32DeviceDataProvider.h → ...rm/silabs/efr32/EFR32DeviceDataProvider.h
diff --git a/examples/platform/efr32/FreeRTOSConfig.h → ...es/platform/silabs/efr32/FreeRTOSConfig.h b/examples/platform/efr32/FreeRTOSConfig.h → ...es/platform/silabs/efr32/FreeRTOSConfig.h
diff --git a/examples/platform/efr32/LEDWidget.cpp → examples/platform/silabs/efr32/LEDWidget.cpp b/examples/platform/efr32/LEDWidget.cpp → examples/platform/silabs/efr32/LEDWidget.cpp
diff --git a/examples/platform/efr32/LEDWidget.h → examples/platform/silabs/efr32/LEDWidget.h b/examples/platform/efr32/LEDWidget.h → examples/platform/silabs/efr32/LEDWidget.h
diff --git a/examples/platform/efr32/MemMonitoring.cpp → ...s/platform/silabs/efr32/MemMonitoring.cpp b/examples/platform/efr32/MemMonitoring.cpp → ...s/platform/silabs/efr32/MemMonitoring.cpp
diff --git a/examples/platform/efr32/OTAConfig.cpp → examples/platform/silabs/efr32/OTAConfig.cpp b/examples/platform/efr32/OTAConfig.cpp → examples/platform/silabs/efr32/OTAConfig.cpp
diff --git a/examples/platform/efr32/OTAConfig.h → examples/platform/silabs/efr32/OTAConfig.h b/examples/platform/efr32/OTAConfig.h → examples/platform/silabs/efr32/OTAConfig.h
@@ -22,7 +22,7 @@
 #include <app/clusters/ota-requestor/DefaultOTARequestor.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/EFR32/OTAImageProcessorImpl.h>
+#include <platform/silabs/EFR32/OTAImageProcessorImpl.h>
 
 class OTAConfig
 {

diff --git a/...ples/platform/efr32/TemperatureSensor.cpp → ...atform/silabs/efr32/TemperatureSensor.cpp b/...ples/platform/efr32/TemperatureSensor.cpp → ...atform/silabs/efr32/TemperatureSensor.cpp
diff --git a/examples/platform/efr32/TemperatureSensor.h → ...platform/silabs/efr32/TemperatureSensor.h b/examples/platform/efr32/TemperatureSensor.h → ...platform/silabs/efr32/TemperatureSensor.h
diff --git a/examples/platform/efr32/args.gni → examples/platform/silabs/efr32/args.gni b/examples/platform/efr32/args.gni → examples/platform/silabs/efr32/args.gni
diff --git a/examples/platform/efr32/board_config.h → ...ples/platform/silabs/efr32/board_config.h b/examples/platform/efr32/board_config.h → ...ples/platform/silabs/efr32/board_config.h
diff --git a/.../platform/efr32/display/demo-ui-bitmaps.h → ...rm/silabs/efr32/display/demo-ui-bitmaps.h b/.../platform/efr32/display/demo-ui-bitmaps.h → ...rm/silabs/efr32/display/demo-ui-bitmaps.h
diff --git a/examples/platform/efr32/display/demo-ui.c → ...s/platform/silabs/efr32/display/demo-ui.c b/examples/platform/efr32/display/demo-ui.c → ...s/platform/silabs/efr32/display/demo-ui.c
diff --git a/examples/platform/efr32/display/demo-ui.h → ...s/platform/silabs/efr32/display/demo-ui.h b/examples/platform/efr32/display/demo-ui.h → ...s/platform/silabs/efr32/display/demo-ui.h
diff --git a/examples/platform/efr32/display/lcd.cpp → ...les/platform/silabs/efr32/display/lcd.cpp b/examples/platform/efr32/display/lcd.cpp → ...les/platform/silabs/efr32/display/lcd.cpp
diff --git a/examples/platform/efr32/display/lcd.h → examples/platform/silabs/efr32/display/lcd.h b/examples/platform/efr32/display/lcd.h → examples/platform/silabs/efr32/display/lcd.h
diff --git a/examples/platform/efr32/efr32_utils.cpp → ...les/platform/silabs/efr32/efr32_utils.cpp b/examples/platform/efr32/efr32_utils.cpp → ...les/platform/silabs/efr32/efr32_utils.cpp
diff --git a/examples/platform/efr32/efr32_utils.h → examples/platform/silabs/efr32/efr32_utils.h b/examples/platform/efr32/efr32_utils.h → examples/platform/silabs/efr32/efr32_utils.h
diff --git a/examples/platform/efr32/init_efrPlatform.cpp → ...latform/silabs/efr32/init_efrPlatform.cpp b/examples/platform/efr32/init_efrPlatform.cpp → ...latform/silabs/efr32/init_efrPlatform.cpp
diff --git a/examples/platform/efr32/init_efrPlatform.h → .../platform/silabs/efr32/init_efrPlatform.h b/examples/platform/efr32/init_efrPlatform.h → .../platform/silabs/efr32/init_efrPlatform.h
diff --git a/...les/platform/efr32/ldscripts/efr32mg12.ld → ...tform/silabs/efr32/ldscripts/efr32mg12.ld b/...les/platform/efr32/ldscripts/efr32mg12.ld → ...tform/silabs/efr32/ldscripts/efr32mg12.ld
diff --git a/...les/platform/efr32/ldscripts/efr32mg21.ld → ...tform/silabs/efr32/ldscripts/efr32mg21.ld b/...les/platform/efr32/ldscripts/efr32mg21.ld → ...tform/silabs/efr32/ldscripts/efr32mg21.ld
diff --git a/...les/platform/efr32/ldscripts/efr32mg24.ld → ...tform/silabs/efr32/ldscripts/efr32mg24.ld b/...les/platform/efr32/ldscripts/efr32mg24.ld → ...tform/silabs/efr32/ldscripts/efr32mg24.ld
diff --git a/examples/platform/efr32/ldscripts/mgm24.ld → .../platform/silabs/efr32/ldscripts/mgm24.ld b/examples/platform/efr32/ldscripts/mgm24.ld → .../platform/silabs/efr32/ldscripts/mgm24.ld