[Silabs] Modified folder structure (#24031)

* Modified folder structure * modified symbolic link
project-chip · Aug 23, 2023 · 6979948 · 6979948
1 parent 8278f7b
commit 6979948
Show file tree

Hide file tree

Showing 60 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -113,7 +113,7 @@ jobs:
       - name: Build example EFR32+WF200 WiFi Lock app for BRD4161A
         timeout-minutes: 15
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false --wifi wf200
+          scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false --wifi wf200
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \
             out/lock_app_wifi_wf200/BRD4161A/chip-efr32-lock-example.out /tmp/bloat_reports/
       - name: Clean out build output

diff --git a/examples/light-switch-app/efr32/build_overrides b/examples/light-switch-app/efr32/build_overrides
diff --git a/examples/light-switch-app/efr32/third_party/connectedhomeip b/examples/light-switch-app/efr32/third_party/connectedhomeip
diff --git a/examples/light-switch-app/efr32/.gn → examples/light-switch-app/silabs/efr32/.gn b/examples/light-switch-app/efr32/.gn → examples/light-switch-app/silabs/efr32/.gn
diff --git a/examples/light-switch-app/efr32/BUILD.gn → ...es/light-switch-app/silabs/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn → ...es/light-switch-app/silabs/efr32/BUILD.gn
@@ -31,7 +31,7 @@ if (chip_enable_pw_rpc) {
 
 assert(current_os == "freertos")
 
-efr32_project_dir = "${chip_root}/examples/light-switch-app/efr32"
+efr32_project_dir = "${chip_root}/examples/light-switch-app/silabs/efr32"
 examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
 examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 

diff --git a/examples/light-switch-app/efr32/README.md → ...s/light-switch-app/silabs/efr32/README.md b/examples/light-switch-app/efr32/README.md → ...s/light-switch-app/silabs/efr32/README.md
diff --git a/examples/light-switch-app/efr32/args.gni → ...es/light-switch-app/silabs/efr32/args.gni b/examples/light-switch-app/efr32/args.gni → ...es/light-switch-app/silabs/efr32/args.gni
diff --git a/...-switch-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni b/...-switch-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni
diff --git a/...switch-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn b/...switch-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn
diff --git a/examples/light-switch-app/silabs/efr32/build_overrides b/examples/light-switch-app/silabs/efr32/build_overrides
@@ -0,0 +1 @@
+../../../build_overrides
diff --git a/...ight-switch-app/efr32/include/AppConfig.h → ...itch-app/silabs/efr32/include/AppConfig.h b/...ight-switch-app/efr32/include/AppConfig.h → ...itch-app/silabs/efr32/include/AppConfig.h
diff --git a/...light-switch-app/efr32/include/AppEvent.h → ...witch-app/silabs/efr32/include/AppEvent.h b/...light-switch-app/efr32/include/AppEvent.h → ...witch-app/silabs/efr32/include/AppEvent.h
diff --git a/.../light-switch-app/efr32/include/AppTask.h → ...switch-app/silabs/efr32/include/AppTask.h b/.../light-switch-app/efr32/include/AppTask.h → ...switch-app/silabs/efr32/include/AppTask.h
diff --git a/...tch-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h b/...tch-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h
diff --git a/...witch-app/efr32/include/binding-handler.h → ...pp/silabs/efr32/include/binding-handler.h b/...witch-app/efr32/include/binding-handler.h → ...pp/silabs/efr32/include/binding-handler.h
diff --git a/...es/light-switch-app/efr32/src/AppTask.cpp → ...t-switch-app/silabs/efr32/src/AppTask.cpp b/...es/light-switch-app/efr32/src/AppTask.cpp → ...t-switch-app/silabs/efr32/src/AppTask.cpp
diff --git a/...ght-switch-app/efr32/src/ZclCallbacks.cpp → ...tch-app/silabs/efr32/src/ZclCallbacks.cpp b/...ght-switch-app/efr32/src/ZclCallbacks.cpp → ...tch-app/silabs/efr32/src/ZclCallbacks.cpp
diff --git a/...-switch-app/efr32/src/binding-handler.cpp → ...-app/silabs/efr32/src/binding-handler.cpp b/...-switch-app/efr32/src/binding-handler.cpp → ...-app/silabs/efr32/src/binding-handler.cpp
diff --git a/examples/light-switch-app/efr32/src/main.cpp → ...ight-switch-app/silabs/efr32/src/main.cpp b/examples/light-switch-app/efr32/src/main.cpp → ...ight-switch-app/silabs/efr32/src/main.cpp
diff --git a/examples/light-switch-app/silabs/efr32/third_party/connectedhomeip b/examples/light-switch-app/silabs/efr32/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../..
diff --git a/examples/lock-app/efr32/build_overrides b/examples/lock-app/efr32/build_overrides
diff --git a/examples/lock-app/efr32/third_party/connectedhomeip b/examples/lock-app/efr32/third_party/connectedhomeip
diff --git a/examples/lock-app/efr32/.gn → examples/lock-app/silabs/efr32/.gn b/examples/lock-app/efr32/.gn → examples/lock-app/silabs/efr32/.gn
diff --git a/examples/lock-app/efr32/BUILD.gn → examples/lock-app/silabs/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn → examples/lock-app/silabs/efr32/BUILD.gn
@@ -31,7 +31,7 @@ if (chip_enable_pw_rpc) {
 
 assert(current_os == "freertos")
 
-efr32_project_dir = "${chip_root}/examples/lock-app/efr32"
+efr32_project_dir = "${chip_root}/examples/lock-app/silabs/efr32"
 examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
 examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 

diff --git a/examples/lock-app/efr32/README.md → examples/lock-app/silabs/efr32/README.md b/examples/lock-app/efr32/README.md → examples/lock-app/silabs/efr32/README.md
diff --git a/examples/lock-app/efr32/args.gni → examples/lock-app/silabs/efr32/args.gni b/examples/lock-app/efr32/args.gni → examples/lock-app/silabs/efr32/args.gni
diff --git a/...es/lock-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni b/...es/lock-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni
diff --git a/...s/lock-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn b/...s/lock-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn
diff --git a/examples/lock-app/silabs/efr32/build_overrides b/examples/lock-app/silabs/efr32/build_overrides
@@ -0,0 +1 @@
+../../../build_overrides
diff --git a/examples/lock-app/efr32/include/AppConfig.h → ...lock-app/silabs/efr32/include/AppConfig.h b/examples/lock-app/efr32/include/AppConfig.h → ...lock-app/silabs/efr32/include/AppConfig.h
diff --git a/examples/lock-app/efr32/include/AppEvent.h → .../lock-app/silabs/efr32/include/AppEvent.h b/examples/lock-app/efr32/include/AppEvent.h → .../lock-app/silabs/efr32/include/AppEvent.h
diff --git a/examples/lock-app/efr32/include/AppTask.h → ...s/lock-app/silabs/efr32/include/AppTask.h b/examples/lock-app/efr32/include/AppTask.h → ...s/lock-app/silabs/efr32/include/AppTask.h
diff --git a/...ock-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h b/...ock-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h
diff --git a/...-app/efr32/include/EventHandlerLibShell.h → ...labs/efr32/include/EventHandlerLibShell.h b/...-app/efr32/include/EventHandlerLibShell.h → ...labs/efr32/include/EventHandlerLibShell.h
diff --git a/...ples/lock-app/efr32/include/LockManager.h → ...ck-app/silabs/efr32/include/LockManager.h b/...ples/lock-app/efr32/include/LockManager.h → ...ck-app/silabs/efr32/include/LockManager.h
diff --git a/examples/lock-app/efr32/src/AppTask.cpp → ...les/lock-app/silabs/efr32/src/AppTask.cpp b/examples/lock-app/efr32/src/AppTask.cpp → ...les/lock-app/silabs/efr32/src/AppTask.cpp
diff --git a/...ck-app/efr32/src/EventHandlerLibShell.cpp → ...silabs/efr32/src/EventHandlerLibShell.cpp b/...ck-app/efr32/src/EventHandlerLibShell.cpp → ...silabs/efr32/src/EventHandlerLibShell.cpp
diff --git a/examples/lock-app/efr32/src/LockManager.cpp → ...lock-app/silabs/efr32/src/LockManager.cpp b/examples/lock-app/efr32/src/LockManager.cpp → ...lock-app/silabs/efr32/src/LockManager.cpp
diff --git a/examples/lock-app/efr32/src/ZclCallbacks.cpp → ...ock-app/silabs/efr32/src/ZclCallbacks.cpp b/examples/lock-app/efr32/src/ZclCallbacks.cpp → ...ock-app/silabs/efr32/src/ZclCallbacks.cpp
diff --git a/examples/lock-app/efr32/src/main.cpp → examples/lock-app/silabs/efr32/src/main.cpp b/examples/lock-app/efr32/src/main.cpp → examples/lock-app/silabs/efr32/src/main.cpp
diff --git a/examples/lock-app/silabs/efr32/third_party/connectedhomeip b/examples/lock-app/silabs/efr32/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../..
diff --git a/examples/lock-app/efr32/with_pw_rpc.gni → ...les/lock-app/silabs/efr32/with_pw_rpc.gni b/examples/lock-app/efr32/with_pw_rpc.gni → ...les/lock-app/silabs/efr32/with_pw_rpc.gni
diff --git a/examples/window-app/efr32/build_overrides b/examples/window-app/efr32/build_overrides
diff --git a/examples/window-app/efr32/third_party/connectedhomeip b/examples/window-app/efr32/third_party/connectedhomeip
diff --git a/examples/window-app/efr32/.gn → examples/window-app/silabs/efr32/.gn b/examples/window-app/efr32/.gn → examples/window-app/silabs/efr32/.gn
diff --git a/examples/window-app/efr32/BUILD.gn → examples/window-app/silabs/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn → examples/window-app/silabs/efr32/BUILD.gn
@@ -25,7 +25,7 @@ import("${efr32_sdk_build_root}/efr32_sdk.gni")
 assert(current_os == "freertos")
 
 project_dir = "${chip_root}/examples/window-app"
-efr32_project_dir = "${project_dir}/efr32"
+efr32_project_dir = "${project_dir}/silabs/efr32"
 examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
 examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 

diff --git a/examples/window-app/efr32/README.md → examples/window-app/silabs/efr32/README.md b/examples/window-app/efr32/README.md → examples/window-app/silabs/efr32/README.md
diff --git a/examples/window-app/efr32/args.gni → examples/window-app/silabs/efr32/args.gni b/examples/window-app/efr32/args.gni → examples/window-app/silabs/efr32/args.gni
diff --git a/.../window-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni b/.../window-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni
diff --git a/...window-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn b/...window-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn
diff --git a/examples/window-app/silabs/efr32/build_overrides b/examples/window-app/silabs/efr32/build_overrides
@@ -0,0 +1 @@
+../../../build_overrides
diff --git a/...ples/window-app/efr32/include/AppConfig.h → ...ndow-app/silabs/efr32/include/AppConfig.h b/...ples/window-app/efr32/include/AppConfig.h → ...ndow-app/silabs/efr32/include/AppConfig.h
diff --git a/...dow-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h b/...dow-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h
diff --git a/...les/window-app/efr32/include/LcdPainter.h → ...dow-app/silabs/efr32/include/LcdPainter.h b/...les/window-app/efr32/include/LcdPainter.h → ...dow-app/silabs/efr32/include/LcdPainter.h
diff --git a/.../window-app/efr32/include/WindowAppImpl.h → ...-app/silabs/efr32/include/WindowAppImpl.h b/.../window-app/efr32/include/WindowAppImpl.h → ...-app/silabs/efr32/include/WindowAppImpl.h
diff --git a/examples/window-app/efr32/src/LcdPainter.cpp → ...indow-app/silabs/efr32/src/LcdPainter.cpp b/examples/window-app/efr32/src/LcdPainter.cpp → ...indow-app/silabs/efr32/src/LcdPainter.cpp
diff --git a/...es/window-app/efr32/src/WindowAppImpl.cpp → ...ow-app/silabs/efr32/src/WindowAppImpl.cpp b/...es/window-app/efr32/src/WindowAppImpl.cpp → ...ow-app/silabs/efr32/src/WindowAppImpl.cpp
diff --git a/examples/window-app/efr32/src/main.cpp → ...ples/window-app/silabs/efr32/src/main.cpp b/examples/window-app/efr32/src/main.cpp → ...ples/window-app/silabs/efr32/src/main.cpp
diff --git a/examples/window-app/silabs/efr32/third_party/connectedhomeip b/examples/window-app/silabs/efr32/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../..
diff --git a/scripts/build/builders/efr32.py b/scripts/build/builders/efr32.py
@@ -70,10 +70,8 @@ def FlashBundleName(self):
     def BuildRoot(self, root):
         if self == Efr32App.UNIT_TEST:
             return os.path.join(root, 'src', 'test_driver', 'efr32')
-        if self == Efr32App.LIGHT:
-            return os.path.join(root, 'examples', self.ExampleName(), 'silabs/efr32')
         else:
-            return os.path.join(root, 'examples', self.ExampleName(), 'efr32')
+            return os.path.join(root, 'examples', self.ExampleName(), 'silabs/efr32')
 
 
 class Efr32Board(Enum):