[Silabs] Rename examples folder (#26766)

* rename build scripts * Rename Lighting-silabs * Rename light-switch-app * Rename Lock-app * rename thermostat * rename silabs chef * Fix build CI * fix doc * fix doc * regen matter * fix ci --------- Co-authored-by: Andrei Litvin <[email protected]>
project-chip · Nov 20, 2023 · 2278936 · 2278936
1 parent 3021423
commit 2278936
Show file tree

Hide file tree

Showing 139 changed files with 84 additions and 143 deletions.
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -87,7 +87,7 @@ jobs:
       - name: Test SLC gen
         timeout-minutes: 30
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32 ./out/light-app BRD4187C --slc_generate --docker
+          scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker
           rm -rf ./out/
       - name: Build some BRD4187C variants
         timeout-minutes: 90
@@ -120,15 +120,15 @@ jobs:
       - name: Build example EFR32+WF200 WiFi Lock app for BRD4161A
         timeout-minutes: 15
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200 --docker
+          scripts/examples/gn_silabs_example.sh examples/lock-app/silabs out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200 --docker
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \
             out/lock_app_wifi_wf200/BRD4161A/matter-silabs-lock-example.out /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out
       - name: Build example EFR32+RS9116 WiFi Lighting app for BRD4161A
         timeout-minutes: 15
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_wifi_rs9116 BRD4161A --wifi rs9116 --docker
+          scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs out/lighting_app_wifi_rs9116 BRD4161A --wifi rs9116 --docker
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rs9116 lighting-app \
             out/lighting_app_wifi_rs9116/BRD4161A/matter-silabs-lighting-example.out /tmp/bloat_reports/
       - name: Clean out build output

diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
@@ -124,7 +124,7 @@ jobs:
                       .environment/pigweed-venv/*.log
 
             - name: Build example EFR32 Lock App
-              run: scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/
+              run: scripts/examples/gn_silabs_example.sh examples/lock-app/efr32/
                   out/lock_app_debug $SILABS_BOARD
 
             - name: Upload artifact

diff --git a/docs/guides/darwin.md b/docs/guides/darwin.md
@@ -252,7 +252,7 @@ Example:
 ##### Guides
 
 -   [Bouffalo Lab](/examples/lighting-app/bouffalolab/README.md)
--   [EFR32 Window Covering](/examples/window-app/silabs/efr32/README.md)
+-   [EFR32 Window Covering](/examples/window-app/silabs/README.md)
 -   [ESP32 All Clusters](/examples/all-clusters-app/esp32/README.md)
 -   [ESP32 Lighting](/examples/lighting-app/esp32/README.md)
 -   [ESP32 Temperature Sensor](/examples/temperature-measurement-app/esp32/README.md)

diff --git a/examples/chef/chef.py b/examples/chef/chef.py
@@ -662,7 +662,7 @@ def main() -> int:
                 shell.run_cmd(f"rm -rf out/{options.sample_device_type_name}")
             efr32_cmd_args = []
             efr32_cmd_args.append(
-                f'{_REPO_BASE_PATH}/scripts/examples/gn_efr32_example.sh')
+                f'{_REPO_BASE_PATH}/scripts/examples/gn_silabs_example.sh')
             efr32_cmd_args.append('./')
             efr32_cmd_args.append(f'out/{options.sample_device_type_name}')
             efr32_cmd_args.append(f'{silabs_board}')

diff --git a/examples/chef/efr32/.gn → examples/chef/silabs/.gn b/examples/chef/efr32/.gn → examples/chef/silabs/.gn
diff --git a/examples/chef/efr32/BUILD.gn → examples/chef/silabs/BUILD.gn b/examples/chef/efr32/BUILD.gn → examples/chef/silabs/BUILD.gn
diff --git a/examples/chef/efr32/args.gni → examples/chef/silabs/args.gni b/examples/chef/efr32/args.gni → examples/chef/silabs/args.gni
diff --git a/examples/chef/efr32/build_for_wifi_args.gni → examples/chef/silabs/build_for_wifi_args.gni b/examples/chef/efr32/build_for_wifi_args.gni → examples/chef/silabs/build_for_wifi_args.gni
diff --git a/examples/chef/efr32/build_for_wifi_gnfile.gn → ...ples/chef/silabs/build_for_wifi_gnfile.gn b/examples/chef/efr32/build_for_wifi_gnfile.gn → ...ples/chef/silabs/build_for_wifi_gnfile.gn
diff --git a/examples/chef/efr32/build_overrides → examples/chef/silabs/build_overrides b/examples/chef/efr32/build_overrides → examples/chef/silabs/build_overrides
diff --git a/examples/chef/efr32/include/AppConfig.h → examples/chef/silabs/include/AppConfig.h b/examples/chef/efr32/include/AppConfig.h → examples/chef/silabs/include/AppConfig.h
diff --git a/examples/chef/efr32/include/AppEvent.h → examples/chef/silabs/include/AppEvent.h b/examples/chef/efr32/include/AppEvent.h → examples/chef/silabs/include/AppEvent.h
diff --git a/examples/chef/efr32/include/AppTask.h → examples/chef/silabs/include/AppTask.h b/examples/chef/efr32/include/AppTask.h → examples/chef/silabs/include/AppTask.h
diff --git a/...es/chef/efr32/include/CHIPProjectConfig.h → ...s/chef/silabs/include/CHIPProjectConfig.h b/...es/chef/efr32/include/CHIPProjectConfig.h → ...s/chef/silabs/include/CHIPProjectConfig.h
diff --git a/...ples/chef/efr32/include/LightingManager.h → ...les/chef/silabs/include/LightingManager.h b/...ples/chef/efr32/include/LightingManager.h → ...les/chef/silabs/include/LightingManager.h
diff --git a/examples/chef/efr32/src/AppTask.cpp → examples/chef/silabs/src/AppTask.cpp b/examples/chef/efr32/src/AppTask.cpp → examples/chef/silabs/src/AppTask.cpp
diff --git a/examples/chef/efr32/src/LightingManager.cpp → examples/chef/silabs/src/LightingManager.cpp b/examples/chef/efr32/src/LightingManager.cpp → examples/chef/silabs/src/LightingManager.cpp
diff --git a/examples/chef/efr32/src/ZclCallbacks.cpp → examples/chef/silabs/src/ZclCallbacks.cpp b/examples/chef/efr32/src/ZclCallbacks.cpp → examples/chef/silabs/src/ZclCallbacks.cpp
diff --git a/...es/chef/efr32/third_party/connectedhomeip → ...s/chef/silabs/third_party/connectedhomeip b/...es/chef/efr32/third_party/connectedhomeip → ...s/chef/silabs/third_party/connectedhomeip
diff --git a/examples/chef/efr32/with_pw_rpc.gni → examples/chef/silabs/with_pw_rpc.gni b/examples/chef/efr32/with_pw_rpc.gni → examples/chef/silabs/with_pw_rpc.gni
diff --git a/examples/light-switch-app/silabs/efr32/.gn → examples/light-switch-app/silabs/.gn b/examples/light-switch-app/silabs/efr32/.gn → examples/light-switch-app/silabs/.gn
diff --git a/...es/light-switch-app/silabs/efr32/BUILD.gn → examples/light-switch-app/silabs/BUILD.gn b/...es/light-switch-app/silabs/efr32/BUILD.gn → examples/light-switch-app/silabs/BUILD.gn
@@ -31,7 +31,7 @@ if (chip_enable_pw_rpc) {
 
 assert(current_os == "freertos")
 
-silabs_project_dir = "${chip_root}/examples/light-switch-app/silabs/efr32"
+silabs_project_dir = "${chip_root}/examples/light-switch-app/silabs"
 examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 if (wifi_soc) {
@@ -80,7 +80,6 @@ if (wifi_soc) {
     ]
 
     include_dirs = [
-      "${chip_root}/examples/light-switch-app/silabs/common",
       "${chip_root}/src/platform/silabs/efr32",
       "${silabs_project_dir}/include",
       "${examples_plat_dir}",
@@ -114,17 +113,14 @@ if (wifi_soc) {
 
 silabs_executable("light_switch_app") {
   output_name = "matter-silabs-light-switch-example.out"
-  include_dirs = [
-    "include",
-    "${chip_root}/examples/light-switch-app/silabs/common/",
-  ]
+  include_dirs = [ "include" ]
   defines = []
 
   sources = [
-    "${chip_root}/examples/light-switch-app/silabs/common/BindingHandler.cpp",
-    "${chip_root}/examples/light-switch-app/silabs/common/LightSwitchMgr.cpp",
     "${examples_common_plat_dir}/main.cpp",
     "src/AppTask.cpp",
+    "src/BindingHandler.cpp",
+    "src/LightSwitchMgr.cpp",
     "src/ZclCallbacks.cpp",
   ]
 
@@ -140,9 +136,7 @@ silabs_executable("light_switch_app") {
   }
 
   if (chip_build_libshell) {
-    sources += [
-      "${chip_root}/examples/light-switch-app/silabs/common/ShellCommands.cpp",
-    ]
+    sources += [ "src/ShellCommands.cpp" ]
   }
 
   if (chip_enable_pw_rpc) {

diff --git a/...s/light-switch-app/silabs/efr32/README.md → examples/light-switch-app/silabs/README.md b/...s/light-switch-app/silabs/efr32/README.md → examples/light-switch-app/silabs/README.md
@@ -106,7 +106,7 @@ Silicon Labs platform.
 *   Build the example application:
 
           cd ~/connectedhomeip
-          ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app BRD4187C
+          ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app BRD4187C
 
 -   To delete generated executable, libraries and object files use:
 
@@ -129,19 +129,19 @@ Silicon Labs platform.
 
 *   Build the example with Matter shell
 
-          ./scripts/examples/gn_efr32_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app BRD4187C chip_build_libshell=true
+          ./scripts/examples/gn_silabs_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app BRD4187C chip_build_libshell=true
 
 *   Build the example as Sleepy End Device (SED)
 
-          $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app_SED BRD4187C --sed
+          $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app_SED BRD4187C --sed
 
     or use gn as previously mentioned but adding the following arguments:
 
           $ gn gen out/debug '--args=SILABS_BOARD="BRD4187C" enable_sleepy_device=true chip_openthread_ftd=false chip_build_libshell=true'
 
 *   Build the example with pigweed RCP
 
-          $ ./scripts/examples/gn_efr32_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
+          $ ./scripts/examples/gn_silabs_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
 
     or use GN/Ninja Directly
 
@@ -155,7 +155,7 @@ Silicon Labs platform.
 For more build options, help is provided when running the build script without
 arguments
 
-    ./scripts/examples/gn_efr32_example.sh
+    ./scripts/examples/gn_silabs_example.sh
 
 ## Flashing the Application
 
@@ -243,7 +243,7 @@ combination with JLinkRTTClient as follows:
 
 -   For this example to work, it is necessary to have a second efr32 device
     running the
-    [lighting app example](https://github.com/project-chip/connectedhomeip/blob/master/examples/lighting-app/silabs/efr32/README.md)
+    [lighting app example](https://github.com/project-chip/connectedhomeip/blob/master/examples/lighting-app/silabs/README.md)
     commissioned on the same openthread network
 
 -   User interface : **LCD** The LCD on Silabs WSTK shows a QR Code. This QR
@@ -409,7 +409,7 @@ tracking code inside the `trackAlloc` and `trackFree` function
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
 
 ## Building options
 
@@ -421,19 +421,19 @@ features can easily be toggled on or off. Here is a short list of options :
 
 chip_progress_logging, chip_detail_logging, chip_automation_logging
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
 
 ### Debug build / release build
 
 is_debug
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "is_debug=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "is_debug=false"
 
 ### Disabling LCD
 
 show_qr_code
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "show_qr_code=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "show_qr_code=false"
 
 ### KVS maximum entry count
 
@@ -442,4 +442,4 @@ kvs_max_entries
     Set the maximum Kvs entries that can be stored in NVM (Default 75)
     Thresholds: 30 <= kvs_max_entries <= 255
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A kvs_max_entries=50
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A kvs_max_entries=50
diff --git a/...-app/silabs/efr32/build_for_wifi_args.gni → ...switch-app/silabs/build_for_wifi_args.gni b/...-app/silabs/efr32/build_for_wifi_args.gni → ...switch-app/silabs/build_for_wifi_args.gni
diff --git a/...app/silabs/efr32/build_for_wifi_gnfile.gn → ...witch-app/silabs/build_for_wifi_gnfile.gn b/...app/silabs/efr32/build_for_wifi_gnfile.gn → ...witch-app/silabs/build_for_wifi_gnfile.gn
diff --git a/examples/light-switch-app/silabs/build_overrides b/examples/light-switch-app/silabs/build_overrides
@@ -0,0 +1 @@
+../../build_overrides
diff --git a/examples/light-switch-app/silabs/efr32/build_overrides b/examples/light-switch-app/silabs/efr32/build_overrides
diff --git a/examples/light-switch-app/silabs/efr32/third_party/connectedhomeip b/examples/light-switch-app/silabs/efr32/third_party/connectedhomeip
diff --git a/...itch-app/silabs/efr32/include/AppConfig.h → ...ght-switch-app/silabs/include/AppConfig.h b/...itch-app/silabs/efr32/include/AppConfig.h → ...ght-switch-app/silabs/include/AppConfig.h
diff --git a/...witch-app/silabs/efr32/include/AppEvent.h → ...ight-switch-app/silabs/include/AppEvent.h b/...witch-app/silabs/efr32/include/AppEvent.h → ...ight-switch-app/silabs/include/AppEvent.h
diff --git a/...switch-app/silabs/efr32/include/AppTask.h → ...light-switch-app/silabs/include/AppTask.h b/...switch-app/silabs/efr32/include/AppTask.h → ...light-switch-app/silabs/include/AppTask.h
diff --git a/...switch-app/silabs/common/BindingHandler.h → ...witch-app/silabs/include/BindingHandler.h b/...switch-app/silabs/common/BindingHandler.h → ...witch-app/silabs/include/BindingHandler.h
diff --git a/.../silabs/efr32/include/CHIPProjectConfig.h → ...ch-app/silabs/include/CHIPProjectConfig.h b/.../silabs/efr32/include/CHIPProjectConfig.h → ...ch-app/silabs/include/CHIPProjectConfig.h
diff --git a/...switch-app/silabs/common/LightSwitchMgr.h → ...witch-app/silabs/include/LightSwitchMgr.h b/...switch-app/silabs/common/LightSwitchMgr.h → ...witch-app/silabs/include/LightSwitchMgr.h
diff --git a/...-switch-app/silabs/common/ShellCommands.h → ...switch-app/silabs/include/ShellCommands.h b/...-switch-app/silabs/common/ShellCommands.h → ...switch-app/silabs/include/ShellCommands.h
diff --git a/...ght-switch-app/silabs/efr32/openthread.gn → ...les/light-switch-app/silabs/openthread.gn b/...ght-switch-app/silabs/efr32/openthread.gn → ...les/light-switch-app/silabs/openthread.gn
diff --git a/...ht-switch-app/silabs/efr32/openthread.gni → ...es/light-switch-app/silabs/openthread.gni b/...ht-switch-app/silabs/efr32/openthread.gni → ...es/light-switch-app/silabs/openthread.gni
diff --git a/...t-switch-app/silabs/efr32/src/AppTask.cpp → ...s/light-switch-app/silabs/src/AppTask.cpp b/...t-switch-app/silabs/efr32/src/AppTask.cpp → ...s/light-switch-app/silabs/src/AppTask.cpp
diff --git a/...itch-app/silabs/common/BindingHandler.cpp → ...-switch-app/silabs/src/BindingHandler.cpp b/...itch-app/silabs/common/BindingHandler.cpp → ...-switch-app/silabs/src/BindingHandler.cpp
diff --git a/...itch-app/silabs/common/LightSwitchMgr.cpp → ...-switch-app/silabs/src/LightSwitchMgr.cpp b/...itch-app/silabs/common/LightSwitchMgr.cpp → ...-switch-app/silabs/src/LightSwitchMgr.cpp
diff --git a/...witch-app/silabs/common/ShellCommands.cpp → ...t-switch-app/silabs/src/ShellCommands.cpp b/...witch-app/silabs/common/ShellCommands.cpp → ...t-switch-app/silabs/src/ShellCommands.cpp
diff --git a/...tch-app/silabs/efr32/src/ZclCallbacks.cpp → ...ht-switch-app/silabs/src/ZclCallbacks.cpp b/...tch-app/silabs/efr32/src/ZclCallbacks.cpp → ...ht-switch-app/silabs/src/ZclCallbacks.cpp
diff --git a/examples/light-switch-app/silabs/third_party/connectedhomeip b/examples/light-switch-app/silabs/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../..
diff --git a/examples/lighting-app/silabs/efr32/.gn → examples/lighting-app/silabs/.gn b/examples/lighting-app/silabs/efr32/.gn → examples/lighting-app/silabs/.gn
diff --git a/examples/lighting-app/silabs/efr32/BUILD.gn → examples/lighting-app/silabs/BUILD.gn b/examples/lighting-app/silabs/efr32/BUILD.gn → examples/lighting-app/silabs/BUILD.gn
@@ -31,7 +31,7 @@ if (chip_enable_pw_rpc) {
 
 assert(current_os == "freertos")
 
-silabs_project_dir = "${chip_root}/examples/lighting-app/silabs/efr32"
+silabs_project_dir = "${chip_root}/examples/lighting-app/silabs"
 examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 if (wifi_soc) {

diff --git a/examples/lighting-app/silabs/efr32/README.md → examples/lighting-app/silabs/README.md b/examples/lighting-app/silabs/efr32/README.md → examples/lighting-app/silabs/README.md
@@ -102,7 +102,7 @@ Silicon Labs platform.
 *   Build the example application:
 
           cd ~/connectedhomeip
-          ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app BRD4187C
+          ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app BRD4187C
 
 -   To delete generated executable, libraries and object files use:
 
@@ -125,15 +125,15 @@ Silicon Labs platform.
 
 *   Build the example as Sleepy End Device (SED)
 
-          $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app_SED BRD4187C --sed
+          $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app_SED BRD4187C --sed
 
     or use gn as previously mentioned but adding the following arguments:
 
           $ gn gen out/debug '--args=SILABS_BOARD="BRD4187C" enable_sleepy_device=true chip_openthread_ftd=false'
 
 *   Build the example with pigweed RPC
 
-          $ ./scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
+          $ ./scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
 
     or use GN/Ninja Directly
 
@@ -149,7 +149,7 @@ Silicon Labs platform.
 For more build options, help is provided when running the build script without
 arguments
 
-         ./scripts/examples/gn_efr32_example.sh
+         ./scripts/examples/gn_silabs_example.sh
 
 ## Flashing the Application
 
@@ -348,13 +348,13 @@ tracking code inside the `trackAlloc` and `trackFree` function
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
 
 ## Group Communication (Multicast)
 
 With this lighting example you can also use group communication to send Lighting
 commands to multiples devices at once. Please refer to the
-[chip-tool documentation](../../../chip-tool/README.md) _Configuring the server
+[chip-tool documentation](../../chip-tool/README.md) _Configuring the server
 side for Group Commands_ and _Using the Client to Send Group (Multicast) Matter
 Commands_
 
@@ -369,19 +369,19 @@ passed to the build scripts.
 
 `chip_progress_logging, chip_detail_logging, chip_automation_logging`
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
 
 ### Debug build / release build
 
 `is_debug`
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "is_debug=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "is_debug=false"
 
 ### Disabling LCD
 
 `show_qr_code`
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "show_qr_code=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "show_qr_code=false"
 
 ### KVS maximum entry count
 
@@ -390,4 +390,4 @@ passed to the build scripts.
     Set the maximum Kvs entries that can be stored in NVM (Default 75)
     Thresholds: 30 <= kvs_max_entries <= 255
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A kvs_max_entries=50
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A kvs_max_entries=50
diff --git a/examples/lighting-app/silabs/SiWx917/args.gni b/examples/lighting-app/silabs/SiWx917/args.gni
diff --git a/examples/lighting-app/silabs/SiWx917/with_pw_rpc.gni b/examples/lighting-app/silabs/SiWx917/with_pw_rpc.gni
diff --git a/...-app/silabs/efr32/build_for_wifi_args.gni → ...ghting-app/silabs/build_for_wifi_args.gni b/...-app/silabs/efr32/build_for_wifi_args.gni → ...ghting-app/silabs/build_for_wifi_args.gni
@@ -20,4 +20,4 @@ import("${chip_root}/src/platform/silabs/wifi_args.gni")
 
 chip_enable_ota_requestor = true
 app_data_model =
-    "${chip_root}/examples/lighting-app/silabs/efr32/data_model:silabs-lighting"
+    "${chip_root}/examples/lighting-app/silabs/data_model:silabs-lighting"
diff --git a/...app/silabs/efr32/build_for_wifi_gnfile.gn → ...hting-app/silabs/build_for_wifi_gnfile.gn b/...app/silabs/efr32/build_for_wifi_gnfile.gn → ...hting-app/silabs/build_for_wifi_gnfile.gn
diff --git a/examples/lighting-app/silabs/build_overrides b/examples/lighting-app/silabs/build_overrides
@@ -0,0 +1 @@
+../../build_overrides
diff --git a/...ting-app/silabs/efr32/data_model/BUILD.gn → ...s/lighting-app/silabs/data_model/BUILD.gn b/...ting-app/silabs/efr32/data_model/BUILD.gn → ...s/lighting-app/silabs/data_model/BUILD.gn
diff --git a/...r32/data_model/lighting-thread-app.matter → ...abs/data_model/lighting-thread-app.matter b/...r32/data_model/lighting-thread-app.matter → ...abs/data_model/lighting-thread-app.matter
diff --git a/.../efr32/data_model/lighting-thread-app.zap → ...silabs/data_model/lighting-thread-app.zap b/.../efr32/data_model/lighting-thread-app.zap → ...silabs/data_model/lighting-thread-app.zap
@@ -18,15 +18,15 @@
   "package": [
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../../../src/app/zap-templates/zcl/zcl.json",
+      "path": "../../../../src/app/zap-templates/zcl/zcl.json",
       "type": "zcl-properties",
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
     },
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../../../src/app/zap-templates/app-templates.json",
+      "path": "../../../../src/app/zap-templates/app-templates.json",
       "type": "gen-templates-json",
       "version": "chip-v1"
     }

diff --git a/...efr32/data_model/lighting-wifi-app.matter → ...ilabs/data_model/lighting-wifi-app.matter b/...efr32/data_model/lighting-wifi-app.matter → ...ilabs/data_model/lighting-wifi-app.matter
diff --git a/...bs/efr32/data_model/lighting-wifi-app.zap → ...p/silabs/data_model/lighting-wifi-app.zap b/...bs/efr32/data_model/lighting-wifi-app.zap → ...p/silabs/data_model/lighting-wifi-app.zap
@@ -18,15 +18,15 @@
   "package": [
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../../../src/app/zap-templates/zcl/zcl.json",
+      "path": "../../../../src/app/zap-templates/zcl/zcl.json",
       "type": "zcl-properties",
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
     },
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../../../src/app/zap-templates/app-templates.json",
+      "path": "../../../../src/app/zap-templates/app-templates.json",
       "type": "gen-templates-json",
       "version": "chip-v1"
     }

diff --git a/examples/lighting-app/silabs/efr32/build_overrides b/examples/lighting-app/silabs/efr32/build_overrides
diff --git a/examples/lighting-app/silabs/efr32/third_party/connectedhomeip b/examples/lighting-app/silabs/efr32/third_party/connectedhomeip
diff --git a/...ting-app/silabs/efr32/include/AppConfig.h → ...s/lighting-app/silabs/include/AppConfig.h b/...ting-app/silabs/efr32/include/AppConfig.h → ...s/lighting-app/silabs/include/AppConfig.h
diff --git a/...hting-app/silabs/efr32/include/AppEvent.h → ...es/lighting-app/silabs/include/AppEvent.h b/...hting-app/silabs/efr32/include/AppEvent.h → ...es/lighting-app/silabs/include/AppEvent.h
diff --git a/...ghting-app/silabs/efr32/include/AppTask.h → ...les/lighting-app/silabs/include/AppTask.h b/...ghting-app/silabs/efr32/include/AppTask.h → ...les/lighting-app/silabs/include/AppTask.h
diff --git a/.../silabs/efr32/include/CHIPProjectConfig.h → ...ng-app/silabs/include/CHIPProjectConfig.h b/.../silabs/efr32/include/CHIPProjectConfig.h → ...ng-app/silabs/include/CHIPProjectConfig.h
diff --git a/...pp/silabs/efr32/include/LightingManager.h → ...ting-app/silabs/include/LightingManager.h b/...pp/silabs/efr32/include/LightingManager.h → ...ting-app/silabs/include/LightingManager.h
diff --git a/...s/lighting-app/silabs/efr32/openthread.gn → examples/lighting-app/silabs/openthread.gn b/...s/lighting-app/silabs/efr32/openthread.gn → examples/lighting-app/silabs/openthread.gn