[Infineon] Support CYW30739 platform inside infineon folder

project-chip · andy31415 · Aug 18, 2022 · Aug 11, 2022 · Aug 16, 2022 · Aug 17, 2022
commit da98b371869d045bd5dc234a0e93e09d80f048ba
diff --git a/.github/workflows/examples-cyw30739.yaml b/.github/workflows/examples-cyw30739.yaml
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -121,6 +121,36 @@ jobs:
                       out/artifacts/infineon-psoc6-light/chip-psoc6-lighting-example.out \
                       /tmp/bloat_reports/
 
+            - name: Build example CYW30739 Apps
+              timeout-minutes: 30
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                    "./scripts/build/build_examples.py \
+                      --target-glob 'cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor-no-progress-logging}' \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                    "
+            - name: Get light size stats
+              timeout-minutes: 5
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cyw30739 cyw930739m2evb_01 light \
+                    out/artifacts/cyw30739-cyw930739m2evb_01-light/chip-cyw30739-lighting-example.elf \
+                    /tmp/bloat_reports/
+            - name: Get lock size stats
+              timeout-minutes: 5
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cyw30739 cyw930739m2evb_01 lock \
+                    out/artifacts/cyw30739-cyw930739m2evb_01-lock/chip-cyw30739-lock-example.elf \
+                    /tmp/bloat_reports/
+            - name: Get ota-requestor size stats
+              timeout-minutes: 5
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cyw30739 cyw930739m2evb_01 ota-requestor-no-progress-logging \
+                    out/artifacts/cyw30739-cyw930739m2evb_01-ota-requestor-no-progress-logging/chip-cyw30739-ota-requestor-example.elf \
+                    /tmp/bloat_reports/
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/.gitmodules b/.gitmodules
@@ -84,7 +84,7 @@
 [submodule "third_party/openthread/ot-ifx"]
 	path = third_party/openthread/ot-ifx
 	url = https://github.com/Infineon/ot-ifx-release.git
-	platforms = cyw30739
+	platforms = infineon
 [submodule "third_party/mbed-os/repo"]
 	path = third_party/mbed-os/repo
 	url = https://github.com/ARMmbed/mbed-os.git
@@ -197,21 +197,21 @@
 	path = third_party/jsoncpp/repo
 	url = https://github.com/open-source-parsers/jsoncpp.git
 [submodule "cyw30739_sdk/30739A0"]
-	path = third_party/cyw30739_sdk/repos/30739A0
+	path = third_party/infineon/cyw30739_sdk/repos/30739A0
 	url = https://github.com/Infineon/OT-Matter-30739A0.git
-	platforms = cyw30739
+	platforms = infineon
 [submodule "cyw30739_sdk/include"]
-	path = third_party/cyw30739_sdk/repos/btsdk-include
+	path = third_party/infineon/cyw30739_sdk/repos/btsdk-include
 	url = https://github.com/Infineon/btsdk-include.git
-	platforms = cyw30739
+	platforms = infineon
 [submodule "cyw30739_sdk/target"]
-	path = third_party/cyw30739_sdk/repos/CYW930739M2EVB-01
+	path = third_party/infineon/cyw30739_sdk/repos/CYW930739M2EVB-01
 	url = https://github.com/Infineon/OT-Matter-TARGET_CYW930739M2EVB-01.git
-	platforms = cyw30739
+	platforms = infineon
 [submodule "cyw30739_sdk/tools"]
-	path = third_party/cyw30739_sdk/repos/btsdk-tools
+	path = third_party/infineon/cyw30739_sdk/repos/btsdk-tools
 	url = https://github.com/Infineon/btsdk-tools.git
-	platforms = cyw30739
+	platforms = infineon
 [submodule "third_party/p6/p6_sdk/libs/anycloud-ota"]
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/anycloud-ota
 	url = https://github.com/Infineon/anycloud-ota

diff --git a/BUILD.gn b/BUILD.gn
@@ -271,8 +271,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     # Set this to true to enable efr32 builds by default.
     enable_efr32_builds = false
 
-    # Set this to true to enable p6 builds by default.
-    enable_p6_builds = false
+    # Set this to true to enable psoc6 builds by default.
+    enable_psoc6_builds = false
 
     # Set this to true to enable Qorvo qpg builds by default.
     enable_qpg_builds = false
@@ -364,8 +364,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     # Build the efr32 lock app example.
     enable_efr32_lock_app_build = enable_efr32_builds
 
-    # Build the p6 lock app example.
-    enable_p6_lock_app_build = enable_p6_builds
+    # Build the psoc6 lock app example.
+    enable_psoc6_lock_app_build = enable_psoc6_builds
 
     # Build the qpgxxxx lock app example.
     enable_qpg_lock_app_build = enable_qpg_builds && !is_debug
@@ -610,12 +610,12 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     extra_build_deps += [ ":efr32_lock_app" ]
   }
 
-  if (enable_p6_lock_app_build) {
-    group("p6_lock_app") {
-      deps = [ "${chip_root}/examples/lock-app/p6(${chip_root}/config/p6/toolchain:p6_lock_app)" ]
+  if (enable_psoc6_lock_app_build) {
+    group("psoc6_lock_app") {
+      deps = [ "${chip_root}/examples/lock-app/infineon/psoc6(${chip_root}/config/psoc6/toolchain:psoc6_lock_app)" ]
     }
 
-    extra_build_deps += [ ":p6_lock_app" ]
+    extra_build_deps += [ ":psoc6_lock_app" ]
   }
 
   if (enable_qpg_lock_app_build) {

diff --git a/config/p6/toolchain/BUILD.gn → config/psoc6/toolchain/BUILD.gn b/config/p6/toolchain/BUILD.gn → config/psoc6/toolchain/BUILD.gn
@@ -17,9 +17,9 @@ import("//build_overrides/chip.gni")
 
 import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni")
 
-arm_toolchain("p6_lock_app") {
+arm_toolchain("psoc6_lock_app") {
   toolchain_args = {
     current_os = "freertos"
-    import("${chip_root}/examples/lock-app/p6/args.gni")
+    import("${chip_root}/examples/lock-app/infineon/psoc6/args.gni")
   }
 }
diff --git a/docs/guides/darwin.md b/docs/guides/darwin.md
@@ -205,7 +205,6 @@ requirements
 ##### Guides
 
 -   [Bouffalo Lab](/examples/lighting-app/bouffalolab/bl602/README.md)
--   [CYW30739 Lighting](/examples/lighting-app/cyw30739/README.md)
 -   [EFR32 Window Covering](/examples/window-app/efr32/README.md)
 -   [ESP32 All Clusters](/examples/all-clusters-app/esp32/README.md)
 -   [ESP32 Lighting](/examples/lighting-app/esp32/README.md)
@@ -215,7 +214,8 @@ requirements
 -   [nRF Connect Pump](/examples/pump-app/nrfconnect/README.md)
 -   [NXP Examples](./nxp_imx8m_linux_examples.md)
 -   [NXP](/examples/all-clusters-app/nxp/mw320/README.md)
--   [P6](/examples/all-clusters-app/infineon/p6/README.md)
+-   [Infineon CYW30739 Lighting](/examples/lighting-app/infineon/cyw30739/README.md)
+-   [Infineon PSoC6](/examples/all-clusters-app/infineon/psoc6/README.md)
 -   [Qorvo](/examples/lighting-app/qpg/README.md)
 -   [SiliconLabs](./silabs_efr32_building.md)
 -   [Simulated Linux](./simulated_device_linux.md)

diff --git a/examples/all-clusters-app/infineon/psoc6/README.md b/examples/all-clusters-app/infineon/psoc6/README.md
@@ -24,9 +24,9 @@ The PSoC6 clusters example provides a baseline demonstration of a Cluster
 control device, built using Matter and the Infineon Modustoolbox SDK. It can be
 controlled by Matter controller over Wi-Fi network.
 
-The P6 device can be commissioned over Bluetooth Low Energy where the device and
-the Matter controller will exchange security information with the Rendezvous
-procedure. Wi-Fi Network credentials are then provided to the P6 device which
+The PSoC6 device can be commissioned over Bluetooth Low Energy where the device
+and the Matter controller will exchange security information with the Rendezvous
+procedure. Wi-Fi Network credentials are then provided to the PSoC6 device which
 will then join the network.
 
 <a name="building"></a>
@@ -36,8 +36,8 @@ will then join the network.
 -   [Modustoolbox Software](https://www.cypress.com/products/modustoolbox)
 
     Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or
-    `scripts/examples/gn_p6_example.sh` for downloading the Software and related
-    tools.
+    `scripts/examples/gn_psoc6_example.sh` for downloading the Software and
+    related tools.
 
 -   Install some additional tools (likely already present for Matter
     developers):
@@ -84,7 +84,7 @@ Commissioning can be carried out using BLE.
 
 ### Setting up Chip tool
 
-Once P6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to
+Once PSoC6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to
 perform commissioning and cluster control.
 
 -   Set up python controller.
@@ -125,6 +125,6 @@ commands. These power cycle the BlueTooth hardware and disable BR/EDR mode.
 
 ## OTA Software Update
 
-For the description of Software Update process with infineon P6 example
+For the description of Software Update process with infineon PSoC6 example
 applications see
-[Infineon P6 OTA Software Update](../../../docs/guides/infineon_p6_software_update.md)
+[Infineon PSoC6 OTA Software Update](../../../../docs/guides/infineon_psoc6_software_update.md)
diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/README.md b/examples/all-clusters-minimal-app/infineon/psoc6/README.md
@@ -24,9 +24,9 @@ The PSoC6 clusters example provides a baseline demonstration of a Cluster
 control device, built using Matter and the Infineon Modustoolbox SDK. It can be
 controlled by Matter controller over Wi-Fi network.
 
-The P6 device can be commissioned over Bluetooth Low Energy where the device and
-the Matter controller will exchange security information with the Rendezvous
-procedure. Wi-Fi Network credentials are then provided to the P6 device which
+The PSoC6 device can be commissioned over Bluetooth Low Energy where the device
+and the Matter controller will exchange security information with the Rendezvous
+procedure. Wi-Fi Network credentials are then provided to the PSoC6 device which
 will then join the network.
 
 <a name="building"></a>
@@ -36,8 +36,8 @@ will then join the network.
 -   [Modustoolbox Software](https://www.cypress.com/products/modustoolbox)
 
     Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or
-    `scripts/examples/gn_p6_example.sh` for downloading the Software and related
-    tools.
+    `scripts/examples/gn_psoc6_example.sh` for downloading the Software and
+    related tools.
 
 -   Install some additional tools (likely already present for Matter
     developers):
@@ -84,7 +84,7 @@ Commissioning can be carried out using BLE.
 
 ### Setting up Chip tool
 
-Once P6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to
+Once PSoC6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to
 perform commissioning and cluster control.
 
 -   Set up python controller.
@@ -125,6 +125,6 @@ commands. These power cycle the BlueTooth hardware and disable BR/EDR mode.
 
 ## OTA Software Update
 
-For the description of Software Update process with infineon P6 example
+For the description of Software Update process with infineon PSoC6 example
 applications see
-[Infineon P6 OTA Software Update](../../../docs/guides/infineon_p6_software_update.md)
+[Infineon PSoC6 OTA Software Update](../../../../docs/guides/infineon_psoc6_software_update.md)
diff --git a/examples/build_overrides/cyw30739_sdk.gni b/examples/build_overrides/cyw30739_sdk.gni
@@ -15,5 +15,5 @@
 declare_args() {
   # Root directory for CYW30739 SDK.
   cyw30739_sdk_build_root =
-      "//third_party/connectedhomeip/third_party/cyw30739_sdk"
+      "//third_party/connectedhomeip/third_party/infineon/cyw30739_sdk"
 }
diff --git a/examples/lighting-app/cyw30739/build_overrides b/examples/lighting-app/cyw30739/build_overrides
diff --git a/examples/lighting-app/cyw30739/third_party/connectedhomeip b/examples/lighting-app/cyw30739/third_party/connectedhomeip
diff --git a/examples/lighting-app/cyw30739/.gn → examples/lighting-app/infineon/cyw30739/.gn b/examples/lighting-app/cyw30739/.gn → examples/lighting-app/infineon/cyw30739/.gn
diff --git a/examples/lighting-app/cyw30739/BUILD.gn → ...s/lighting-app/infineon/cyw30739/BUILD.gn b/examples/lighting-app/cyw30739/BUILD.gn → ...s/lighting-app/infineon/cyw30739/BUILD.gn
@@ -19,8 +19,8 @@ import("//build_overrides/cyw30739_sdk.gni")
 import("${cyw30739_sdk_build_root}/cyw30739_executable.gni")
 import("${cyw30739_sdk_build_root}/cyw30739_sdk.gni")
 
-cyw30739_project_dir = "${chip_root}/examples/lighting-app/cyw30739"
-examples_plat_dir = "${chip_root}/examples/platform/cyw30739"
+cyw30739_project_dir = "${chip_root}/examples/lighting-app/infineon/cyw30739"
+examples_plat_dir = "${chip_root}/examples/platform/infineon/cyw30739"
 
 declare_args() {
   setupPinCode = 20202021

diff --git a/examples/lighting-app/cyw30739/README.md → .../lighting-app/infineon/cyw30739/README.md b/examples/lighting-app/cyw30739/README.md → .../lighting-app/infineon/cyw30739/README.md
@@ -32,7 +32,7 @@ dataset and CASE credentials are then provided.
     ```bash
     $ cd ~/connectedhomeip
     $ git submodule update --init
-    $ ./scripts/examples/gn_build_example.sh examples/lighting-app/cyw30739 out/lighting-app
+    $ ./scripts/examples/gn_build_example.sh examples/lighting-app/infineon/cyw30739 out/lighting-app
     ```
 
 -   To delete generated executable, libraries and object files use:
@@ -45,7 +45,7 @@ dataset and CASE credentials are then provided.
 -   OR use GN/Ninja directly
 
     ```bash
-    $ cd ~/connectedhomeip/examples/lighting-app/cyw30739
+    $ cd ~/connectedhomeip/examples/lighting-app/infineon/cyw30739
     $ git submodule update --init
     $ source third_party/connectedhomeip/scripts/activate.sh
     $ gn gen out/debug
@@ -55,7 +55,7 @@ dataset and CASE credentials are then provided.
 -   To delete generated executable, libraries and object files use:
 
     ```bash
-    $ cd ~/connectedhomeip/examples/lighting-app/cyw30739
+    $ cd ~/connectedhomeip/examples/lighting-app/infineon/cyw30739
     $ rm -rf out/
     ```
 
@@ -75,7 +75,7 @@ Put the CYW30739 in to the recovery mode before running the flash script.
 -   On the command line:
 
     ```bash
-    $ cd ~/connectedhomeip/examples/lighting-app/cyw30739
+    $ cd ~/connectedhomeip/examples/lighting-app/infineon/cyw30739
     $ python3 out/debug/chip-cyw30739-lighting-example.flash.py
     ```