diff --git a/.github/workflows/examples-cyw30739.yaml b/.github/workflows/examples-cyw30739.yaml deleted file mode 100644 index a3126dbba0442c..00000000000000 --- a/.github/workflows/examples-cyw30739.yaml +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright (c) 2021 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: Build example - Infineon CYW30739 - -on: - push: - pull_request: - -concurrency: - group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} - cancel-in-progress: true - -jobs: - cyw30739: - name: CYW30739 - timeout-minutes: 60 - - runs-on: ubuntu-latest - if: github.actor != 'restyled-io[bot]' - - container: - image: connectedhomeip/chip-build:latest - volumes: - - "/tmp/bloat_reports:/tmp/bloat_reports" - steps: - - uses: Wandalen/wretry.action@v1.0.15 - name: Checkout - with: - action: actions/checkout@v3 - with: | - token: ${{ github.token }} - attempt_limit: 3 - attempt_delay: 2000 - - name: Checkout submodules - run: scripts/checkout_submodules.py --shallow --platform cyw30739 - - - name: Set up environment for size reports - if: ${{ !env.ACT }} - env: - GH_CONTEXT: ${{ toJson(github) }} - run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}" - - - name: Bootstrap - timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh - - name: Uploading bootstrap logs - uses: actions/upload-artifact@v2 - if: ${{ always() && !env.ACT }} - with: - name: bootstrap-logs - path: | - .environment/gn_out/.ninja_log - .environment/pigweed-venv/*.log - - 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 }} - with: - name: Size,CYW30739-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }} - path: | - /tmp/bloat_reports/ diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index 7fc9cdd4485be0..cc5a8f522596d5 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Build example - Infineon P6 +name: Build example - Infineon on: push: @@ -33,7 +33,8 @@ jobs: container: image: connectedhomeip/chip-build-infineon:0.5.91 - + volumes: + - "/tmp/bloat_reports:/tmp/bloat_reports" steps: - uses: Wandalen/wretry.action@v1.0.15 name: Checkout @@ -44,7 +45,7 @@ jobs: attempt_limit: 3 attempt_delay: 2000 - name: Checkout submodules - run: scripts/checkout_submodules.py --shallow --platform p6 + run: scripts/checkout_submodules.py --shallow --platform infineon - name: Set up environment for size reports if: ${{ !env.ACT }} @@ -63,65 +64,97 @@ jobs: path: | .environment/gn_out/.ninja_log .environment/pigweed-venv/*.log - - name: Build lock-app example + - name: Build PSoC6 lock-app example timeout-minutes: 15 run: | scripts/run_in_build_env.sh \ "scripts/build/build_examples.py \ --enable-flashbundle --no-log-timestamps \ - --target infineon-p6-lock \ + --target infineon-psoc6-lock \ build \ --copy-artifacts-to out/artifacts \ " .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - p6 default lock-app \ - out/infineon-p6-lock/chip-p6-lock-example.out - - name: Build all-clusters-app example + psoc6 cy8ckit_062s2_43012 lock \ + out/artifacts/infineon-psoc6-lock/chip-psoc6-lock-example.out \ + /tmp/bloat_reports/ + - name: Build PSoC6 all-clusters-app example timeout-minutes: 20 run: | scripts/run_in_build_env.sh \ "scripts/build/build_examples.py \ --enable-flashbundle --no-log-timestamps \ - --target infineon-p6-all-clusters \ + --target infineon-psoc6-all-clusters \ build \ --copy-artifacts-to out/artifacts \ " .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - p6 default all-clusters-app \ - out/infineon-p6-all-clusters/chip-p6-clusters-example.out - - name: Build all-clusters-minimal-app example + psoc6 cy8ckit_062s2_43012 all-clusters \ + out/artifacts/infineon-psoc6-all-clusters/chip-psoc6-clusters-example.out \ + /tmp/bloat_reports/ + - name: Build PSoC6 all-clusters-minimal-app example timeout-minutes: 20 run: | scripts/run_in_build_env.sh \ "scripts/build/build_examples.py \ --enable-flashbundle --no-log-timestamps \ - --target infineon-p6-all-clusters-minimal \ + --target infineon-psoc6-all-clusters-minimal \ build \ --copy-artifacts-to out/artifacts \ " .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - p6 default all-clusters-minimal-app \ - out/infineon-p6-all-clusters-minimal/chip-p6-clusters-minimal-example.out - - name: Build lighting-app example + psoc6 cy8ckit_062s2_43012 all-clusters-minimal \ + out/artifacts/infineon-psoc6-all-clusters-minimal/chip-psoc6-clusters-minimal-example.out \ + /tmp/bloat_reports/ + - name: Build PSoC6 lighting-app example timeout-minutes: 15 run: | scripts/run_in_build_env.sh \ "scripts/build/build_examples.py \ --enable-flashbundle --no-log-timestamps \ - --target infineon-p6-light \ + --target infineon-psoc6-light \ build \ --copy-artifacts-to out/artifacts \ " .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - p6 default light-app \ - out/infineon-p6-light/chip-p6-lighting-example.out + psoc6 cy8ckit_062s2_43012 light \ + 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 }} with: - name: Size,P6-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }} + name: Size,Infineon-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }} path: | - out/infineon-p6-lock/p6-default-lock-app-sizes.json - out/infineon-p6-all-clusters/p6-default-all-clusters-app-sizes.json - out/infineon-p6-all-clusters-minimal/p6-default-all-clusters-minimal-app-sizes.json - out/infineon-p6-light/p6-default-light-app-sizes.json + /tmp/bloat_reports/ diff --git a/.gitmodules b/.gitmodules index abde0e5f8cdfd5..2f40b45697df5a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -62,7 +62,7 @@ path = third_party/freertos/repo url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git branch = V10.3.1-kernel-only - platforms = ameba,cc13x2_26x2,bl602,efr32,esp32,k32w0,p6,qpg + platforms = ameba,cc13x2_26x2,bl602,efr32,esp32,k32w0,infineon,qpg [submodule "simw-top-mini"] path = third_party/simw-top-mini/repo url = https://github.com/NXP/plug-and-trust.git @@ -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 @@ -101,129 +101,129 @@ branch = main platforms = mbed [submodule "p6/abstraction-rtos"] - path = third_party/p6/p6_sdk/libs/abstraction-rtos + path = third_party/infineon/psoc6/psoc6_sdk/libs/abstraction-rtos url = https://github.com/Infineon/abstraction-rtos - platforms = p6 + platforms = infineon [submodule "p6/bluetooth-freertos"] - path = third_party/p6/p6_sdk/libs/bluetooth-freertos + path = third_party/infineon/psoc6/psoc6_sdk/libs/bluetooth-freertos url = https://github.com/Infineon/bluetooth-freertos branch = v2.X - platforms = p6 + platforms = infineon [submodule "p6/btstack"] - path = third_party/p6/p6_sdk/libs/btstack + path = third_party/infineon/psoc6/psoc6_sdk/libs/btstack url = https://github.com/Infineon/btstack - platforms = p6 + platforms = infineon [submodule "p6/clib-support"] - path = third_party/p6/p6_sdk/libs/clib-support + path = third_party/infineon/psoc6/psoc6_sdk/libs/clib-support url = https://github.com/Infineon/clib-support - platforms = p6 + platforms = infineon [submodule "p6/connectivity-utilities"] - path = third_party/p6/p6_sdk/libs/connectivity-utilities + path = third_party/infineon/psoc6/psoc6_sdk/libs/connectivity-utilities url = https://github.com/Infineon/connectivity-utilities - platforms = p6 + platforms = infineon [submodule "p6/core-lib"] - path = third_party/p6/p6_sdk/libs/core-lib + path = third_party/infineon/psoc6/psoc6_sdk/libs/core-lib url = https://github.com/Infineon/core-lib - platforms = p6 + platforms = infineon [submodule "p6/core-make"] - path = third_party/p6/p6_sdk/libs/core-make + path = third_party/infineon/psoc6/psoc6_sdk/libs/core-make url = https://github.com/Infineon/core-make - platforms = p6 + platforms = infineon [submodule "p6/kv-store"] - path = third_party/p6/p6_sdk/libs/kv-store + path = third_party/infineon/psoc6/psoc6_sdk/libs/kv-store url = https://github.com/Infineon/kv-store - platforms = p6 + platforms = infineon [submodule "p6/mtb-hal-cat1"] - path = third_party/p6/p6_sdk/libs/mtb-hal-cat1 + path = third_party/infineon/psoc6/psoc6_sdk/libs/mtb-hal-cat1 url = https://github.com/Infineon/mtb-hal-cat1 - platforms = p6 + platforms = infineon [submodule "p6/mtb-pdl-cat1"] - path = third_party/p6/p6_sdk/libs/mtb-pdl-cat1 + path = third_party/infineon/psoc6/psoc6_sdk/libs/mtb-pdl-cat1 url = https://github.com/Infineon/mtb-pdl-cat1 - platforms = p6 + platforms = infineon [submodule "p6/psoc6cm0p"] - path = third_party/p6/p6_sdk/libs/psoc6cm0p + path = third_party/infineon/psoc6/psoc6_sdk/libs/psoc6cm0p url = https://github.com/Infineon/psoc6cm0p - platforms = p6 + platforms = infineon [submodule "p6/whd-bsp-integration"] - path = third_party/p6/p6_sdk/libs/whd-bsp-integration + path = third_party/infineon/psoc6/psoc6_sdk/libs/whd-bsp-integration url = https://github.com/Infineon/whd-bsp-integration - platforms = p6 + platforms = infineon [submodule "p6/wifi-connection-manager"] - path = third_party/p6/p6_sdk/libs/wifi-connection-manager + path = third_party/infineon/psoc6/psoc6_sdk/libs/wifi-connection-manager url = https://github.com/Infineon/wifi-connection-manager - platforms = p6 + platforms = infineon [submodule "p6/wifi-host-driver"] - path = third_party/p6/p6_sdk/libs/wifi-host-driver + path = third_party/infineon/psoc6/psoc6_sdk/libs/wifi-host-driver url = https://github.com/Infineon/wifi-host-driver - platforms = p6 + platforms = infineon [submodule "p6/wifi-mw-core"] - path = third_party/p6/p6_sdk/libs/wifi-mw-core + path = third_party/infineon/psoc6/psoc6_sdk/libs/wifi-mw-core url = https://github.com/Infineon/wifi-mw-core - platforms = p6 + platforms = infineon [submodule "p6/TARGET_CY8CKIT-062S2-43012"] - path = third_party/p6/p6_sdk/libs/TARGET_CY8CKIT-062S2-43012 + path = third_party/infineon/psoc6/psoc6_sdk/libs/TARGET_CY8CKIT-062S2-43012 url = https://github.com/Infineon/TARGET_CY8CKIT-062S2-43012 - platforms = p6 + platforms = infineon [submodule "p6/freertos"] - path = third_party/p6/p6_sdk/libs/freertos + path = third_party/infineon/psoc6/psoc6_sdk/libs/freertos url = https://github.com/Infineon/freertos - platforms = p6 + platforms = infineon [submodule "p6/retarget-io"] - path = third_party/p6/p6_sdk/libs/retarget-io + path = third_party/infineon/psoc6/psoc6_sdk/libs/retarget-io url = https://github.com/Infineon/retarget-io - platforms = p6 + platforms = infineon [submodule "p6/mbedtls"] - path = third_party/p6/p6_sdk/libs/mbedtls + path = third_party/infineon/psoc6/psoc6_sdk/libs/mbedtls url = https://github.com/ARMmbed/mbedtls - platforms = p6 + platforms = infineon [submodule "p6/secure-sockets"] - path = third_party/p6/p6_sdk/libs/secure-sockets + path = third_party/infineon/psoc6/psoc6_sdk/libs/secure-sockets url = https://github.com/Infineon/secure-sockets - platforms = p6 + platforms = infineon [submodule "p6/recipe-make-cat1a"] - path = third_party/p6/p6_sdk/libs/recipe-make-cat1a + path = third_party/infineon/psoc6/psoc6_sdk/libs/recipe-make-cat1a url = https://github.com/Infineon/recipe-make-cat1a - platforms = p6 + platforms = infineon [submodule "third_party/pybind11/repo"] path = third_party/pybind11/repo url = https://github.com/pybind/pybind11 branch = stable [submodule "p6/lwip"] - path = third_party/p6/p6_sdk/libs/lwip + path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip url = https://github.com/lwip-tcpip/lwip.git - platforms = p6 + platforms = infineon [submodule "third_party/jsoncpp/repo"] 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/p6/p6_sdk/libs/anycloud-ota + path = third_party/infineon/psoc6/psoc6_sdk/libs/anycloud-ota url = https://github.com/Infineon/anycloud-ota - platforms = p6 + platforms = infineon [submodule "third_party/mbed-mcu-boot/repo"] path = third_party/mbed-mcu-boot/repo url = https://github.com/ATmobica/mcuboot.git platforms = mbed [submodule "p6/serial-flash"] - path = third_party/p6/p6_sdk/libs/serial-flash + path = third_party/infineon/psoc6/psoc6_sdk/libs/serial-flash url = https://github.com/Infineon/serial-flash - platforms = p6 + platforms = infineon [submodule "third_party/telink_sdk/repo"] path = third_party/telink_sdk/repo url = https://github.com/telink-semi/telink_b91_ble_single_connection_sdk_matter diff --git a/BUILD.gn b/BUILD.gn index a233ab272621c7..7dbbb83d3cc77b 100644 --- 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/build_overrides/p6.gni b/build_overrides/psoc6.gni similarity index 75% rename from build_overrides/p6.gni rename to build_overrides/psoc6.gni index 0ae9c543ee8456..a4fc95b53917c1 100644 --- a/build_overrides/p6.gni +++ b/build_overrides/psoc6.gni @@ -13,11 +13,11 @@ # limitations under the License. declare_args() { - # Root directory for p6 SDK build files. - p6_sdk_build_root = "//third_party/p6" + # Root directory for psoc6 SDK build files. + psoc6_sdk_build_root = "//third_party/infineon/psoc6" } declare_args() { - # Root directory for p6 SDK sources. - p6_sdk_root = "${p6_sdk_build_root}/p6_sdk" + # Root directory for psoc6 SDK sources. + psoc6_sdk_root = "${psoc6_sdk_build_root}/psoc6_sdk" } diff --git a/config/p6/toolchain/BUILD.gn b/config/psoc6/toolchain/BUILD.gn similarity index 88% rename from config/p6/toolchain/BUILD.gn rename to config/psoc6/toolchain/BUILD.gn index 219ae1bf1102ed..542012522ea8cb 100644 --- a/config/p6/toolchain/BUILD.gn +++ b/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/README.md b/docs/guides/README.md index 09f3f9c1c4c3e7..44d0a8dc9fcb4a 100644 --- a/docs/guides/README.md +++ b/docs/guides/README.md @@ -5,7 +5,7 @@ - [Android - Building](./android_building.md) - [Apple - Testing with iPhone, iPad, macOS, Apple TV, HomePod, Watch, etc](./darwin.md) - [Espressif (ESP32) - Getting Started Guide](./esp32/README.md) -- [Infineon - Software Update](./infineon_p6_software_update.md) +- [Infineon PSoC6 - Software Update](./infineon_psoc6_software_update.md) - [Linux - Simulated Devices](./simulated_device_linux.md) - [mbedOS - Adding a new target](./mbedos_add_new_target.md) - [mbedOS - Commissioning](./mbedos_commissioning.md) diff --git a/docs/guides/darwin.md b/docs/guides/darwin.md index 2d9443d70a6d0a..b28a9925d53cd0 100644 --- 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/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/docs/guides/infineon_p6_software_update.md b/docs/guides/infineon_psoc6_software_update.md similarity index 75% rename from docs/guides/infineon_p6_software_update.md rename to docs/guides/infineon_psoc6_software_update.md index 136f577dfb6301..7cddc020c6c417 100644 --- a/docs/guides/infineon_p6_software_update.md +++ b/docs/guides/infineon_psoc6_software_update.md @@ -1,8 +1,8 @@ -# Matter Software Update with Infineon P6 example applications +# Matter Software Update with Infineon PSoC6 example applications The Over The Air (OTA) Software Update functionality can be added to any of the -Infineon P6 example applications by passing the `chip_enable_ota_requestor=true` -option to the build script. +Infineon PSoC6 example applications by passing the +`chip_enable_ota_requestor=true` option to the build script. ## Running the OTA Download scenario @@ -11,7 +11,7 @@ option to the build script. OTA Requestor is any node that needs to be updated and can communicate with the OTA Provider to fetch applicable software updates. In the procedure described below, the OTA Provider will be a Linux application and the - example running on the Infineon P6 board will work as the OTA Requestor. + example running on the Infineon PSoC6 board will work as the OTA Requestor. - On a Linux or Darwin platform build the chip-tool and the ota-provider-app as follows: @@ -21,33 +21,33 @@ option to the build script. scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug chip_config_network_layer_ble=false ``` -- Build the P6 OTA Requestor application from the chip root dir: +- Build the PSoC6 OTA Requestor application from the chip root dir: ``` - $ scripts/build/build_examples.py --enable-flashbundle --target infineon-p6-lock-ota build - $ third_party/p6/p6_sdk/ota/ota_base_build.sh out/infineon-p6-lock-ota chip-p6-lock-example + $ scripts/build/build_examples.py --enable-flashbundle --target infineon-psoc6-lock-ota build + $ third_party/psoc6/psoc6_sdk/ota/ota_base_build.sh out/infineon-psoc6-lock-ota chip-psoc6-lock-example ``` -- Build the P6 OTA Update application from the chip root dir and create OTA +- Build the PSoC6 OTA Update application from the chip root dir and create OTA file ``` - $ scripts/build/build_examples.py --enable-flashbundle --no-log-timestamps --target infineon-p6-lock-ota-updateimage build - $ third_party/p6/p6_sdk/ota/ota_update_build.sh out/infineon-p6-lock-ota-updateimage chip-p6-lock-example + $ scripts/build/build_examples.py --enable-flashbundle --no-log-timestamps --target infineon-psoc6-lock-ota-updateimage build + $ third_party/psoc6/psoc6_sdk/ota/ota_update_build.sh out/infineon-psoc6-lock-ota-updateimage chip-psoc6-lock-example ``` * Additionally a pre-compiled bootloader must be flashed to the board using [Cypress Programmer](https://softwaretools.infineon.com/tools/com.ifx.tb.tool.cypressprogrammer). This image can be found at: - $ ./third_party/p6/p6_sdk/ota/matter-psoc6-mcuboot-bootloader.hex + $ ./third_party/psoc6/psoc6_sdk/ota/matter-psoc6-mcuboot-bootloader.hex * In a terminal start the Provider app passing to it the path to the Matter OTA file created in the previous step:(output of ota_update_build step) ``` rm -r /tmp/chip_* - ./out/debug/chip-ota-provider-app -f chip-p6-lock-example.ota + ./out/debug/chip-ota-provider-app -f chip-psoc6-lock-example.ota ``` * In a separate terminal run the chip-tool commands to provision the Provider: diff --git a/examples/all-clusters-app/p6/.gn b/examples/all-clusters-app/infineon/psoc6/.gn similarity index 100% rename from examples/all-clusters-app/p6/.gn rename to examples/all-clusters-app/infineon/psoc6/.gn diff --git a/examples/all-clusters-app/p6/BUILD.gn b/examples/all-clusters-app/infineon/psoc6/BUILD.gn similarity index 79% rename from examples/all-clusters-app/p6/BUILD.gn rename to examples/all-clusters-app/infineon/psoc6/BUILD.gn index 1fa873956a4830..a92d8fb969e171 100644 --- a/examples/all-clusters-app/p6/BUILD.gn +++ b/examples/all-clusters-app/infineon/psoc6/BUILD.gn @@ -14,17 +14,17 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") -import("//build_overrides/p6.gni") +import("//build_overrides/psoc6.gni") import("${build_root}/config/defaults.gni") import("${chip_root}/src/platform/device.gni") -import("${p6_sdk_build_root}/p6_executable.gni") -import("${p6_sdk_build_root}/p6_sdk.gni") +import("${psoc6_sdk_build_root}/psoc6_executable.gni") +import("${psoc6_sdk_build_root}/psoc6_sdk.gni") assert(current_os == "freertos") -p6_project_dir = "${chip_root}/examples/all-clusters-app/p6" -examples_plat_dir = "${chip_root}/examples/platform/p6" +psoc6_project_dir = "${chip_root}/examples/all-clusters-app/infineon/psoc6" +examples_plat_dir = "${chip_root}/examples/platform/infineon/psoc6" declare_args() { # Dump memory usage at link time. @@ -40,8 +40,8 @@ declare_args() { build_update_image = false } -config("p6_ota_config") { - linker_script = "${p6_sdk_root}/ota/cy8c6xxa_cm4_dual_ota_int.ld" +config("psoc6_ota_config") { + linker_script = "${psoc6_sdk_root}/ota/cy8c6xxa_cm4_dual_ota_int.ld" ldflags = [ "-T" + rebase_path(linker_script, root_build_dir) ] @@ -78,38 +78,39 @@ config("p6_ota_config") { } } -p6_sdk_sources("all_clusters_app_sdk_sources") { +psoc6_sdk_sources("all_clusters_app_sdk_sources") { include_dirs = [ - "${chip_root}/src/platform/P6", - "${p6_project_dir}/include", + "${chip_root}/src/platform/PSOC6", + "${psoc6_project_dir}/include", "${examples_plat_dir}", ] defines = [ - "BOARD_ID=${p6_board}", + "BOARD_ID=${psoc6_board}", "P6_LOG_ENABLED=1", "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE=${setup_pin_code}", ] - sources = [ "${p6_project_dir}/include/CHIPProjectConfig.h" ] + sources = [ "${psoc6_project_dir}/include/CHIPProjectConfig.h" ] - public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ] + public_configs = + [ "${chip_root}/third_party/infineon/psoc6:psoc6_sdk_config" ] if (chip_enable_ota_requestor) { - public_configs += [ ":p6_ota_config" ] + public_configs += [ ":psoc6_ota_config" ] } } -p6_executable("clusters_app") { +psoc6_executable("clusters_app") { include_dirs = [] defines = [] - output_name = "chip-p6-clusters-example.out" + output_name = "chip-psoc6-clusters-example.out" sources = [ "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", "${examples_plat_dir}/LEDWidget.cpp", - "${examples_plat_dir}/init_p6Platform.cpp", + "${examples_plat_dir}/init_psoc6Platform.cpp", "src/AppTask.cpp", "src/ButtonHandler.cpp", "src/ClusterManager.cpp", @@ -129,7 +130,7 @@ p6_executable("clusters_app") { include_dirs += [ "include", "${examples_plat_dir}", - "${p6_project_dir}/include", + "${psoc6_project_dir}/include", "${chip_root}/examples/all-clusters-app/all-clusters-common/include", ] @@ -150,10 +151,10 @@ p6_executable("clusters_app") { output_dir = root_out_dir } -group("p6") { +group("psoc6") { deps = [ ":clusters_app" ] } group("default") { - deps = [ ":p6" ] + deps = [ ":psoc6" ] } diff --git a/examples/all-clusters-app/p6/README.md b/examples/all-clusters-app/infineon/psoc6/README.md similarity index 75% rename from examples/all-clusters-app/p6/README.md rename to examples/all-clusters-app/infineon/psoc6/README.md index d218c24c97dc46..c28c43d9c3f248 100644 --- a/examples/all-clusters-app/p6/README.md +++ b/examples/all-clusters-app/infineon/psoc6/README.md @@ -1,10 +1,10 @@ -#CHIP P6 All Clusters Example +#CHIP PSoC6 All Clusters Example An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board.
-- [Matter P6 All Clusters Example](#chip-p6-clusters-example) +- [Matter PSoC6 All Clusters Example](#chip-psoc6-clusters-example) - [Introduction](#introduction) - [Building](#building) - [Flashing the Application](#flashing-the-application) @@ -20,13 +20,13 @@ An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board. ## Introduction -The P6 clusters example provides a baseline demonstration of a Cluster control -device, built using Matter and the Infineon Modustoolbox SDK. It can be +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. @@ -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): @@ -54,7 +54,7 @@ will then join the network. * Build the example application: $ source scripts/activate.sh - $ scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-all-clusters' build + $ scripts/build/build_examples.py --no-log-timestamps --target 'infineon-psoc6-all-clusters' build - To delete generated executable, libraries and object files use: @@ -72,7 +72,7 @@ will then join the network. - On the command line: $ cd ~/connectedhomeip - $ python3 out/infineon-p6-all-clusters/chip-p6-clusters-example.flash.py + $ python3 out/infineon-psoc6-all-clusters/chip-psoc6-clusters-example.flash.py @@ -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-app/p6/args.gni b/examples/all-clusters-app/infineon/psoc6/args.gni similarity index 89% rename from examples/all-clusters-app/p6/args.gni rename to examples/all-clusters-app/infineon/psoc6/args.gni index 2a93385cf36bd6..ce7a2ab93e794d 100644 --- a/examples/all-clusters-app/p6/args.gni +++ b/examples/all-clusters-app/infineon/psoc6/args.gni @@ -14,7 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") -import("${chip_root}/src/platform/P6/args.gni") +import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") -p6_target_project = +psoc6_target_project = get_label_info(":all_clusters_app_sdk_sources", "label_no_toolchain") diff --git a/examples/all-clusters-app/infineon/psoc6/build_overrides b/examples/all-clusters-app/infineon/psoc6/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/all-clusters-app/infineon/psoc6/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/all-clusters-app/p6/include/AppConfig.h b/examples/all-clusters-app/infineon/psoc6/include/AppConfig.h similarity index 100% rename from examples/all-clusters-app/p6/include/AppConfig.h rename to examples/all-clusters-app/infineon/psoc6/include/AppConfig.h diff --git a/examples/all-clusters-app/p6/include/AppEvent.h b/examples/all-clusters-app/infineon/psoc6/include/AppEvent.h similarity index 100% rename from examples/all-clusters-app/p6/include/AppEvent.h rename to examples/all-clusters-app/infineon/psoc6/include/AppEvent.h diff --git a/examples/all-clusters-app/p6/include/AppTask.h b/examples/all-clusters-app/infineon/psoc6/include/AppTask.h similarity index 100% rename from examples/all-clusters-app/p6/include/AppTask.h rename to examples/all-clusters-app/infineon/psoc6/include/AppTask.h diff --git a/examples/all-clusters-app/p6/include/ButtonHandler.h b/examples/all-clusters-app/infineon/psoc6/include/ButtonHandler.h similarity index 100% rename from examples/all-clusters-app/p6/include/ButtonHandler.h rename to examples/all-clusters-app/infineon/psoc6/include/ButtonHandler.h diff --git a/examples/all-clusters-app/p6/include/CHIPProjectConfig.h b/examples/all-clusters-app/infineon/psoc6/include/CHIPProjectConfig.h similarity index 100% rename from examples/all-clusters-app/p6/include/CHIPProjectConfig.h rename to examples/all-clusters-app/infineon/psoc6/include/CHIPProjectConfig.h diff --git a/examples/all-clusters-app/p6/include/ClusterManager.h b/examples/all-clusters-app/infineon/psoc6/include/ClusterManager.h similarity index 100% rename from examples/all-clusters-app/p6/include/ClusterManager.h rename to examples/all-clusters-app/infineon/psoc6/include/ClusterManager.h diff --git a/examples/all-clusters-app/p6/src/AppTask.cpp b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp similarity index 99% rename from examples/all-clusters-app/p6/src/AppTask.cpp rename to examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp index 615660976db3ef..4e0d1c8cf731e8 100644 --- a/examples/all-clusters-app/p6/src/AppTask.cpp +++ b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include /* OTA related includes */ #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR @@ -50,7 +50,7 @@ #include #include #include -#include +#include using chip::BDXDownloader; using chip::CharSpan; diff --git a/examples/all-clusters-app/p6/src/ButtonHandler.cpp b/examples/all-clusters-app/infineon/psoc6/src/ButtonHandler.cpp similarity index 100% rename from examples/all-clusters-app/p6/src/ButtonHandler.cpp rename to examples/all-clusters-app/infineon/psoc6/src/ButtonHandler.cpp diff --git a/examples/all-clusters-app/p6/src/ClusterManager.cpp b/examples/all-clusters-app/infineon/psoc6/src/ClusterManager.cpp similarity index 100% rename from examples/all-clusters-app/p6/src/ClusterManager.cpp rename to examples/all-clusters-app/infineon/psoc6/src/ClusterManager.cpp diff --git a/examples/all-clusters-app/p6/src/ZclCallbacks.cpp b/examples/all-clusters-app/infineon/psoc6/src/ZclCallbacks.cpp similarity index 100% rename from examples/all-clusters-app/p6/src/ZclCallbacks.cpp rename to examples/all-clusters-app/infineon/psoc6/src/ZclCallbacks.cpp diff --git a/examples/all-clusters-app/p6/src/main.cpp b/examples/all-clusters-app/infineon/psoc6/src/main.cpp similarity index 99% rename from examples/all-clusters-app/p6/src/main.cpp rename to examples/all-clusters-app/infineon/psoc6/src/main.cpp index 7f38b516b93fe1..84b1961f9a881f 100644 --- a/examples/all-clusters-app/p6/src/main.cpp +++ b/examples/all-clusters-app/infineon/psoc6/src/main.cpp @@ -36,7 +36,7 @@ #include "AppConfig.h" #include "cyhal_wdt.h" -#include "init_p6Platform.h" +#include "init_psoc6Platform.h" #include #ifdef HEAP_MONITORING diff --git a/examples/all-clusters-app/infineon/psoc6/third_party/connectedhomeip b/examples/all-clusters-app/infineon/psoc6/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/all-clusters-app/infineon/psoc6/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/all-clusters-app/p6/build_overrides b/examples/all-clusters-app/p6/build_overrides deleted file mode 120000 index 194ee0b812dc3d..00000000000000 --- a/examples/all-clusters-app/p6/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides/ \ No newline at end of file diff --git a/examples/all-clusters-app/p6/third_party/connectedhomeip b/examples/all-clusters-app/p6/third_party/connectedhomeip deleted file mode 120000 index 11a54ed360106c..00000000000000 --- a/examples/all-clusters-app/p6/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../../ \ No newline at end of file diff --git a/examples/all-clusters-minimal-app/p6/.gn b/examples/all-clusters-minimal-app/infineon/psoc6/.gn similarity index 100% rename from examples/all-clusters-minimal-app/p6/.gn rename to examples/all-clusters-minimal-app/infineon/psoc6/.gn diff --git a/examples/all-clusters-minimal-app/p6/BUILD.gn b/examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn similarity index 78% rename from examples/all-clusters-minimal-app/p6/BUILD.gn rename to examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn index 53d303ce5f4ecb..2b90698856083a 100644 --- a/examples/all-clusters-minimal-app/p6/BUILD.gn +++ b/examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn @@ -14,17 +14,18 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") -import("//build_overrides/p6.gni") +import("//build_overrides/psoc6.gni") import("${build_root}/config/defaults.gni") import("${chip_root}/src/platform/device.gni") -import("${p6_sdk_build_root}/p6_executable.gni") -import("${p6_sdk_build_root}/p6_sdk.gni") +import("${psoc6_sdk_build_root}/psoc6_executable.gni") +import("${psoc6_sdk_build_root}/psoc6_sdk.gni") assert(current_os == "freertos") -p6_project_dir = "${chip_root}/examples/all-clusters-minimal-app/p6" -examples_plat_dir = "${chip_root}/examples/platform/p6" +psoc6_project_dir = + "${chip_root}/examples/all-clusters-minimal-app/infineon/psoc6" +examples_plat_dir = "${chip_root}/examples/platform/infineon/psoc6" declare_args() { # Dump memory usage at link time. @@ -40,8 +41,8 @@ declare_args() { build_update_image = false } -config("p6_ota_config") { - linker_script = "${p6_sdk_root}/ota/cy8c6xxa_cm4_dual_ota_int.ld" +config("psoc6_ota_config") { + linker_script = "${psoc6_sdk_root}/ota/cy8c6xxa_cm4_dual_ota_int.ld" ldflags = [ "-T" + rebase_path(linker_script, root_build_dir) ] @@ -78,38 +79,39 @@ config("p6_ota_config") { } } -p6_sdk_sources("all_clusters_app_sdk_sources") { +psoc6_sdk_sources("all_clusters_app_sdk_sources") { include_dirs = [ - "${chip_root}/src/platform/P6", - "${p6_project_dir}/include", + "${chip_root}/src/platform/PSOC6", + "${psoc6_project_dir}/include", "${examples_plat_dir}", ] defines = [ - "BOARD_ID=${p6_board}", + "BOARD_ID=${psoc6_board}", "P6_LOG_ENABLED=1", "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE=${setup_pin_code}", ] - sources = [ "${p6_project_dir}/include/CHIPProjectConfig.h" ] + sources = [ "${psoc6_project_dir}/include/CHIPProjectConfig.h" ] - public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ] + public_configs = + [ "${chip_root}/third_party/infineon/psoc6:psoc6_sdk_config" ] if (chip_enable_ota_requestor) { - public_configs += [ ":p6_ota_config" ] + public_configs += [ ":psoc6_ota_config" ] } } -p6_executable("clusters_minimal_app") { +psoc6_executable("clusters_minimal_app") { include_dirs = [] defines = [] - output_name = "chip-p6-clusters-minimal-example.out" + output_name = "chip-psoc6-clusters-minimal-example.out" sources = [ "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", "${examples_plat_dir}/LEDWidget.cpp", - "${examples_plat_dir}/init_p6Platform.cpp", + "${examples_plat_dir}/init_psoc6Platform.cpp", "src/AppTask.cpp", "src/ButtonHandler.cpp", "src/ClusterManager.cpp", @@ -129,7 +131,7 @@ p6_executable("clusters_minimal_app") { include_dirs += [ "include", "${examples_plat_dir}", - "${p6_project_dir}/include", + "${psoc6_project_dir}/include", "${chip_root}/examples/all-clusters-app/all-clusters-common/include", ] @@ -150,10 +152,10 @@ p6_executable("clusters_minimal_app") { output_dir = root_out_dir } -group("p6") { +group("psoc6") { deps = [ ":clusters_minimal_app" ] } group("default") { - deps = [ ":p6" ] + deps = [ ":psoc6" ] } diff --git a/examples/all-clusters-minimal-app/p6/README.md b/examples/all-clusters-minimal-app/infineon/psoc6/README.md similarity index 75% rename from examples/all-clusters-minimal-app/p6/README.md rename to examples/all-clusters-minimal-app/infineon/psoc6/README.md index 730891ccef53a1..1f7a40ef9b28ac 100644 --- a/examples/all-clusters-minimal-app/p6/README.md +++ b/examples/all-clusters-minimal-app/infineon/psoc6/README.md @@ -1,10 +1,10 @@ -#CHIP P6 All Clusters Example +#CHIP PSoC6 All Clusters Example An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board.
-- [Matter P6 All Clusters Example](#chip-p6-clusters-example) +- [Matter PSoC6 All Clusters Example](#chip-psoc6-clusters-example) - [Introduction](#introduction) - [Building](#building) - [Flashing the Application](#flashing-the-application) @@ -20,13 +20,13 @@ An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board. ## Introduction -The P6 clusters example provides a baseline demonstration of a Cluster control -device, built using Matter and the Infineon Modustoolbox SDK. It can be +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. @@ -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): @@ -54,7 +54,7 @@ will then join the network. * Build the example application: $ source scripts/activate.sh - $ scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-all-clusters-minimal' build + $ scripts/build/build_examples.py --no-log-timestamps --target 'infineon-psoc6-all-clusters-minimal' build - To delete generated executable, libraries and object files use: @@ -72,7 +72,7 @@ will then join the network. - On the command line: $ cd ~/connectedhomeip - $ python3 out/infineon-p6-all-clusters-minimal/chip-p6-clusters-minimal-example.flash.py + $ python3 out/infineon-psoc6-all-clusters-minimal/chip-psoc6-clusters-minimal-example.flash.py @@ -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/p6/args.gni b/examples/all-clusters-minimal-app/infineon/psoc6/args.gni similarity index 89% rename from examples/all-clusters-minimal-app/p6/args.gni rename to examples/all-clusters-minimal-app/infineon/psoc6/args.gni index 2a93385cf36bd6..ce7a2ab93e794d 100644 --- a/examples/all-clusters-minimal-app/p6/args.gni +++ b/examples/all-clusters-minimal-app/infineon/psoc6/args.gni @@ -14,7 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") -import("${chip_root}/src/platform/P6/args.gni") +import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") -p6_target_project = +psoc6_target_project = get_label_info(":all_clusters_app_sdk_sources", "label_no_toolchain") diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/build_overrides b/examples/all-clusters-minimal-app/infineon/psoc6/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/all-clusters-minimal-app/infineon/psoc6/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/all-clusters-minimal-app/p6/include/AppConfig.h b/examples/all-clusters-minimal-app/infineon/psoc6/include/AppConfig.h similarity index 100% rename from examples/all-clusters-minimal-app/p6/include/AppConfig.h rename to examples/all-clusters-minimal-app/infineon/psoc6/include/AppConfig.h diff --git a/examples/all-clusters-minimal-app/p6/include/AppEvent.h b/examples/all-clusters-minimal-app/infineon/psoc6/include/AppEvent.h similarity index 100% rename from examples/all-clusters-minimal-app/p6/include/AppEvent.h rename to examples/all-clusters-minimal-app/infineon/psoc6/include/AppEvent.h diff --git a/examples/all-clusters-minimal-app/p6/include/AppTask.h b/examples/all-clusters-minimal-app/infineon/psoc6/include/AppTask.h similarity index 100% rename from examples/all-clusters-minimal-app/p6/include/AppTask.h rename to examples/all-clusters-minimal-app/infineon/psoc6/include/AppTask.h diff --git a/examples/all-clusters-minimal-app/p6/include/ButtonHandler.h b/examples/all-clusters-minimal-app/infineon/psoc6/include/ButtonHandler.h similarity index 100% rename from examples/all-clusters-minimal-app/p6/include/ButtonHandler.h rename to examples/all-clusters-minimal-app/infineon/psoc6/include/ButtonHandler.h diff --git a/examples/all-clusters-minimal-app/p6/include/CHIPProjectConfig.h b/examples/all-clusters-minimal-app/infineon/psoc6/include/CHIPProjectConfig.h similarity index 100% rename from examples/all-clusters-minimal-app/p6/include/CHIPProjectConfig.h rename to examples/all-clusters-minimal-app/infineon/psoc6/include/CHIPProjectConfig.h diff --git a/examples/all-clusters-minimal-app/p6/include/ClusterManager.h b/examples/all-clusters-minimal-app/infineon/psoc6/include/ClusterManager.h similarity index 100% rename from examples/all-clusters-minimal-app/p6/include/ClusterManager.h rename to examples/all-clusters-minimal-app/infineon/psoc6/include/ClusterManager.h diff --git a/examples/all-clusters-minimal-app/p6/src/AppTask.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp similarity index 99% rename from examples/all-clusters-minimal-app/p6/src/AppTask.cpp rename to examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp index 45a3dfb8af90b7..13eb9e09e01431 100644 --- a/examples/all-clusters-minimal-app/p6/src/AppTask.cpp +++ b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include /* OTA related includes */ #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR @@ -50,7 +50,7 @@ #include #include #include -#include +#include using chip::BDXDownloader; using chip::CharSpan; diff --git a/examples/all-clusters-minimal-app/p6/src/ButtonHandler.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/ButtonHandler.cpp similarity index 100% rename from examples/all-clusters-minimal-app/p6/src/ButtonHandler.cpp rename to examples/all-clusters-minimal-app/infineon/psoc6/src/ButtonHandler.cpp diff --git a/examples/all-clusters-minimal-app/p6/src/ClusterManager.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/ClusterManager.cpp similarity index 100% rename from examples/all-clusters-minimal-app/p6/src/ClusterManager.cpp rename to examples/all-clusters-minimal-app/infineon/psoc6/src/ClusterManager.cpp diff --git a/examples/all-clusters-minimal-app/p6/src/ZclCallbacks.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/ZclCallbacks.cpp similarity index 100% rename from examples/all-clusters-minimal-app/p6/src/ZclCallbacks.cpp rename to examples/all-clusters-minimal-app/infineon/psoc6/src/ZclCallbacks.cpp diff --git a/examples/all-clusters-minimal-app/p6/src/main.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/main.cpp similarity index 96% rename from examples/all-clusters-minimal-app/p6/src/main.cpp rename to examples/all-clusters-minimal-app/infineon/psoc6/src/main.cpp index 7f38b516b93fe1..a7587170607d28 100644 --- a/examples/all-clusters-minimal-app/p6/src/main.cpp +++ b/examples/all-clusters-minimal-app/infineon/psoc6/src/main.cpp @@ -36,7 +36,7 @@ #include "AppConfig.h" #include "cyhal_wdt.h" -#include "init_p6Platform.h" +#include "init_psoc6Platform.h" #include #ifdef HEAP_MONITORING @@ -143,7 +143,7 @@ int main(void) #endif P6_LOG("==================================================\r\n"); - P6_LOG("chip-p6-all-clusters-example starting Version %d\r\n", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION); + P6_LOG("chip-p6-all-clusters-minimal-example starting Version %d\r\n", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION); P6_LOG("==================================================\r\n"); /* Start the FreeRTOS scheduler */ diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/third_party/connectedhomeip b/examples/all-clusters-minimal-app/infineon/psoc6/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/all-clusters-minimal-app/infineon/psoc6/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/all-clusters-minimal-app/p6/build_overrides b/examples/all-clusters-minimal-app/p6/build_overrides deleted file mode 120000 index 194ee0b812dc3d..00000000000000 --- a/examples/all-clusters-minimal-app/p6/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides/ \ No newline at end of file diff --git a/examples/all-clusters-minimal-app/p6/third_party/connectedhomeip b/examples/all-clusters-minimal-app/p6/third_party/connectedhomeip deleted file mode 120000 index 11a54ed360106c..00000000000000 --- a/examples/all-clusters-minimal-app/p6/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../../ \ No newline at end of file diff --git a/examples/build_overrides/cyw30739_sdk.gni b/examples/build_overrides/cyw30739_sdk.gni index d2c81de46ba614..d98ac9866b0a4f 100644 --- 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/build_overrides/p6.gni b/examples/build_overrides/psoc6.gni similarity index 73% rename from examples/build_overrides/p6.gni rename to examples/build_overrides/psoc6.gni index 91890631da64bf..87d5ca9f2a295f 100644 --- a/examples/build_overrides/p6.gni +++ b/examples/build_overrides/psoc6.gni @@ -13,11 +13,12 @@ # limitations under the License. declare_args() { - # Root directory for P6 SDK. - p6_sdk_build_root = "//third_party/connectedhomeip/third_party/p6" + # Root directory for PSOC6 SDK. + psoc6_sdk_build_root = + "//third_party/connectedhomeip/third_party/infineon/psoc6" } declare_args() { - # Root directory for p6 SDK sources. - p6_sdk_root = "${p6_sdk_build_root}/p6_sdk" + # Root directory for psoc6 SDK sources. + psoc6_sdk_root = "${psoc6_sdk_build_root}/psoc6_sdk" } diff --git a/examples/lighting-app/cyw30739/build_overrides b/examples/lighting-app/cyw30739/build_overrides deleted file mode 120000 index e578e73312ebd1..00000000000000 --- a/examples/lighting-app/cyw30739/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides \ No newline at end of file diff --git a/examples/lighting-app/cyw30739/third_party/connectedhomeip b/examples/lighting-app/cyw30739/third_party/connectedhomeip deleted file mode 120000 index c866b86874994d..00000000000000 --- a/examples/lighting-app/cyw30739/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../.. \ No newline at end of file diff --git a/examples/lighting-app/cyw30739/.gn b/examples/lighting-app/infineon/cyw30739/.gn similarity index 100% rename from examples/lighting-app/cyw30739/.gn rename to examples/lighting-app/infineon/cyw30739/.gn diff --git a/examples/lighting-app/cyw30739/BUILD.gn b/examples/lighting-app/infineon/cyw30739/BUILD.gn similarity index 93% rename from examples/lighting-app/cyw30739/BUILD.gn rename to examples/lighting-app/infineon/cyw30739/BUILD.gn index 86d7342430b378..be63607b0bf97b 100644 --- a/examples/lighting-app/cyw30739/BUILD.gn +++ b/examples/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 b/examples/lighting-app/infineon/cyw30739/README.md similarity index 93% rename from examples/lighting-app/cyw30739/README.md rename to examples/lighting-app/infineon/cyw30739/README.md index d43e663b5f12e0..72753e2299f942 100644 --- a/examples/lighting-app/cyw30739/README.md +++ b/examples/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 ``` diff --git a/examples/lock-app/cyw30739/args.gni b/examples/lighting-app/infineon/cyw30739/args.gni similarity index 93% rename from examples/lock-app/cyw30739/args.gni rename to examples/lighting-app/infineon/cyw30739/args.gni index 267c1db9b56817..ff653ee769356a 100644 --- a/examples/lock-app/cyw30739/args.gni +++ b/examples/lighting-app/infineon/cyw30739/args.gni @@ -13,7 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/src/platform/CYW30739/args.gni") +import("${chip_root}/src/platform/Infineon/CYW30739/args.gni") cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lighting-app/infineon/cyw30739/build_overrides b/examples/lighting-app/infineon/cyw30739/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/lighting-app/infineon/cyw30739/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/lighting-app/cyw30739/include/AppShellCommands.h b/examples/lighting-app/infineon/cyw30739/include/AppShellCommands.h similarity index 100% rename from examples/lighting-app/cyw30739/include/AppShellCommands.h rename to examples/lighting-app/infineon/cyw30739/include/AppShellCommands.h diff --git a/examples/lighting-app/cyw30739/include/ButtonHandler.h b/examples/lighting-app/infineon/cyw30739/include/ButtonHandler.h similarity index 100% rename from examples/lighting-app/cyw30739/include/ButtonHandler.h rename to examples/lighting-app/infineon/cyw30739/include/ButtonHandler.h diff --git a/examples/lighting-app/cyw30739/include/CHIPProjectConfig.h b/examples/lighting-app/infineon/cyw30739/include/CHIPProjectConfig.h similarity index 100% rename from examples/lighting-app/cyw30739/include/CHIPProjectConfig.h rename to examples/lighting-app/infineon/cyw30739/include/CHIPProjectConfig.h diff --git a/examples/lighting-app/cyw30739/include/LightingManager.h b/examples/lighting-app/infineon/cyw30739/include/LightingManager.h similarity index 100% rename from examples/lighting-app/cyw30739/include/LightingManager.h rename to examples/lighting-app/infineon/cyw30739/include/LightingManager.h diff --git a/examples/lighting-app/cyw30739/src/AppShellCommands.cpp b/examples/lighting-app/infineon/cyw30739/src/AppShellCommands.cpp similarity index 100% rename from examples/lighting-app/cyw30739/src/AppShellCommands.cpp rename to examples/lighting-app/infineon/cyw30739/src/AppShellCommands.cpp diff --git a/examples/lighting-app/cyw30739/src/ButtonHandler.cpp b/examples/lighting-app/infineon/cyw30739/src/ButtonHandler.cpp similarity index 100% rename from examples/lighting-app/cyw30739/src/ButtonHandler.cpp rename to examples/lighting-app/infineon/cyw30739/src/ButtonHandler.cpp diff --git a/examples/lighting-app/cyw30739/src/LightingManager.cpp b/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp similarity index 100% rename from examples/lighting-app/cyw30739/src/LightingManager.cpp rename to examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp diff --git a/examples/lighting-app/cyw30739/src/ZclCallbacks.cpp b/examples/lighting-app/infineon/cyw30739/src/ZclCallbacks.cpp similarity index 100% rename from examples/lighting-app/cyw30739/src/ZclCallbacks.cpp rename to examples/lighting-app/infineon/cyw30739/src/ZclCallbacks.cpp diff --git a/examples/lighting-app/cyw30739/src/main.cpp b/examples/lighting-app/infineon/cyw30739/src/main.cpp similarity index 100% rename from examples/lighting-app/cyw30739/src/main.cpp rename to examples/lighting-app/infineon/cyw30739/src/main.cpp diff --git a/examples/lighting-app/cyw30739/static_config.txt b/examples/lighting-app/infineon/cyw30739/static_config.txt similarity index 100% rename from examples/lighting-app/cyw30739/static_config.txt rename to examples/lighting-app/infineon/cyw30739/static_config.txt diff --git a/examples/lighting-app/infineon/cyw30739/third_party/connectedhomeip b/examples/lighting-app/infineon/cyw30739/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/lighting-app/infineon/cyw30739/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/lighting-app/p6/.gn b/examples/lighting-app/infineon/psoc6/.gn similarity index 100% rename from examples/lighting-app/p6/.gn rename to examples/lighting-app/infineon/psoc6/.gn diff --git a/examples/lighting-app/p6/BUILD.gn b/examples/lighting-app/infineon/psoc6/BUILD.gn similarity index 77% rename from examples/lighting-app/p6/BUILD.gn rename to examples/lighting-app/infineon/psoc6/BUILD.gn index 7e6608f45c60d7..08a91b1180728f 100644 --- a/examples/lighting-app/p6/BUILD.gn +++ b/examples/lighting-app/infineon/psoc6/BUILD.gn @@ -14,17 +14,17 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") -import("//build_overrides/p6.gni") +import("//build_overrides/psoc6.gni") import("${build_root}/config/defaults.gni") import("${chip_root}/src/platform/device.gni") -import("${p6_sdk_build_root}/p6_executable.gni") -import("${p6_sdk_build_root}/p6_sdk.gni") +import("${psoc6_sdk_build_root}/psoc6_executable.gni") +import("${psoc6_sdk_build_root}/psoc6_sdk.gni") assert(current_os == "freertos") -p6_project_dir = "${chip_root}/examples/lighting-app/p6" -examples_plat_dir = "${chip_root}/examples/platform/p6" +psoc6_project_dir = "${chip_root}/examples/lighting-app/infineon/psoc6" +examples_plat_dir = "${chip_root}/examples/platform/infineon/psoc6" declare_args() { # Dump memory usage at link time. @@ -40,8 +40,8 @@ declare_args() { build_update_image = false } -config("p6_ota_config") { - linker_script = "${p6_sdk_root}/ota/cy8c6xxa_cm4_dual_ota_int.ld" +config("psoc6_ota_config") { + linker_script = "${psoc6_sdk_root}/ota/cy8c6xxa_cm4_dual_ota_int.ld" ldflags = [ "-T" + rebase_path(linker_script, root_build_dir) ] @@ -78,35 +78,37 @@ config("p6_ota_config") { } } -p6_sdk_sources("lighting_app_sdk_sources") { +psoc6_sdk_sources("lighting_app_sdk_sources") { include_dirs = [ - "${chip_root}/src/platform/P6", - "${p6_project_dir}/include", + "${chip_root}/src/platform/PSOC6", + "${psoc6_project_dir}/include", "${examples_plat_dir}", ] defines = [ - "BOARD_ID=${p6_board}", + "BOARD_ID=${psoc6_board}", "P6_LOG_ENABLED=1", "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE=${setup_pin_code}", ] - sources = [ "${p6_project_dir}/include/CHIPProjectConfig.h" ] - public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ] + sources = [ "${psoc6_project_dir}/include/CHIPProjectConfig.h" ] + + public_configs = + [ "${chip_root}/third_party/infineon/psoc6:psoc6_sdk_config" ] if (chip_enable_ota_requestor) { - public_configs += [ ":p6_ota_config" ] + public_configs += [ ":psoc6_ota_config" ] } } -p6_executable("lighting_app") { +psoc6_executable("lighting_app") { include_dirs = [] defines = [] - output_name = "chip-p6-lighting-example.out" + output_name = "chip-psoc6-lighting-example.out" sources = [ "${examples_plat_dir}/LEDWidget.cpp", - "${examples_plat_dir}/init_p6Platform.cpp", + "${examples_plat_dir}/init_psoc6Platform.cpp", "src/AppTask.cpp", "src/ButtonHandler.cpp", "src/LightingManager.cpp", @@ -126,7 +128,7 @@ p6_executable("lighting_app") { include_dirs += [ "include", "${examples_plat_dir}", - "${p6_project_dir}/include", + "${psoc6_project_dir}/include", ] defines = [] @@ -146,10 +148,10 @@ p6_executable("lighting_app") { output_dir = root_out_dir } -group("p6") { +group("psoc6") { deps = [ ":lighting_app" ] } group("default") { - deps = [ ":p6" ] + deps = [ ":psoc6" ] } diff --git a/examples/lighting-app/p6/README.md b/examples/lighting-app/infineon/psoc6/README.md similarity index 81% rename from examples/lighting-app/p6/README.md rename to examples/lighting-app/infineon/psoc6/README.md index e37894efcafb2d..ea229f0f391029 100644 --- a/examples/lighting-app/p6/README.md +++ b/examples/lighting-app/infineon/psoc6/README.md @@ -1,10 +1,10 @@ -#CHIP P6 Lighting Example +#CHIP PSoC6 Lighting Example An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board.
-- [Matter P6 Lighting Example](#chip-p6-Lighting-example) +- [Matter PSoC6 Lighting Example](#chip-psoc6-Lighting-example) - [Introduction](#introduction) - [Building](#building) - [Flashing the Application](#flashing-the-application) @@ -21,13 +21,13 @@ An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board. ## Introduction -The P6 lighting example provides a baseline demonstration of a Light control +The PSoC6 lighting example provides a baseline demonstration of a Light 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. @@ -37,8 +37,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): \$ sudo apt install gcc g++ clang ninja-build python @@ -51,7 +51,7 @@ will then join the network. * Build the example application: $ source scripts/activate.sh - $ scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-light' build + $ scripts/build/build_examples.py --no-log-timestamps --target 'infineon-psoc6-light' build - To delete generated executable, libraries and object files use: @@ -69,7 +69,7 @@ will then join the network. - On the command line: $ cd ~/connectedhomeip - $ python3 out/infineon-p6-light/chip-p6-lighting-example.flash.py + $ python3 out/infineon-psoc6-light/chip-psoc6-lighting-example.flash.py @@ -81,7 +81,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. @@ -139,6 +139,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/lighting-app/p6/args.gni b/examples/lighting-app/infineon/psoc6/args.gni similarity index 89% rename from examples/lighting-app/p6/args.gni rename to examples/lighting-app/infineon/psoc6/args.gni index f239efee01e5da..9ca701ab363c9f 100644 --- a/examples/lighting-app/p6/args.gni +++ b/examples/lighting-app/infineon/psoc6/args.gni @@ -14,7 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") -import("${chip_root}/src/platform/P6/args.gni") +import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") -p6_target_project = +psoc6_target_project = get_label_info(":lighting_app_sdk_sources", "label_no_toolchain") diff --git a/examples/lighting-app/infineon/psoc6/build_overrides b/examples/lighting-app/infineon/psoc6/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/lighting-app/infineon/psoc6/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/lighting-app/p6/include/AppConfig.h b/examples/lighting-app/infineon/psoc6/include/AppConfig.h similarity index 100% rename from examples/lighting-app/p6/include/AppConfig.h rename to examples/lighting-app/infineon/psoc6/include/AppConfig.h diff --git a/examples/lighting-app/p6/include/AppEvent.h b/examples/lighting-app/infineon/psoc6/include/AppEvent.h similarity index 100% rename from examples/lighting-app/p6/include/AppEvent.h rename to examples/lighting-app/infineon/psoc6/include/AppEvent.h diff --git a/examples/lighting-app/p6/include/AppTask.h b/examples/lighting-app/infineon/psoc6/include/AppTask.h similarity index 100% rename from examples/lighting-app/p6/include/AppTask.h rename to examples/lighting-app/infineon/psoc6/include/AppTask.h diff --git a/examples/lighting-app/p6/include/ButtonHandler.h b/examples/lighting-app/infineon/psoc6/include/ButtonHandler.h similarity index 100% rename from examples/lighting-app/p6/include/ButtonHandler.h rename to examples/lighting-app/infineon/psoc6/include/ButtonHandler.h diff --git a/examples/lighting-app/p6/include/CHIPProjectConfig.h b/examples/lighting-app/infineon/psoc6/include/CHIPProjectConfig.h similarity index 100% rename from examples/lighting-app/p6/include/CHIPProjectConfig.h rename to examples/lighting-app/infineon/psoc6/include/CHIPProjectConfig.h diff --git a/examples/lighting-app/p6/include/LightingManager.h b/examples/lighting-app/infineon/psoc6/include/LightingManager.h similarity index 100% rename from examples/lighting-app/p6/include/LightingManager.h rename to examples/lighting-app/infineon/psoc6/include/LightingManager.h diff --git a/examples/lighting-app/p6/src/AppTask.cpp b/examples/lighting-app/infineon/psoc6/src/AppTask.cpp similarity index 99% rename from examples/lighting-app/p6/src/AppTask.cpp rename to examples/lighting-app/infineon/psoc6/src/AppTask.cpp index 08f9b76a1a3f8f..2ee2baf54bcde8 100644 --- a/examples/lighting-app/p6/src/AppTask.cpp +++ b/examples/lighting-app/infineon/psoc6/src/AppTask.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include /* OTA related includes */ #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR @@ -48,7 +48,7 @@ #include #include #include -#include +#include using chip::BDXDownloader; using chip::CharSpan; diff --git a/examples/lighting-app/p6/src/ButtonHandler.cpp b/examples/lighting-app/infineon/psoc6/src/ButtonHandler.cpp similarity index 100% rename from examples/lighting-app/p6/src/ButtonHandler.cpp rename to examples/lighting-app/infineon/psoc6/src/ButtonHandler.cpp diff --git a/examples/lighting-app/p6/src/LightingManager.cpp b/examples/lighting-app/infineon/psoc6/src/LightingManager.cpp similarity index 100% rename from examples/lighting-app/p6/src/LightingManager.cpp rename to examples/lighting-app/infineon/psoc6/src/LightingManager.cpp diff --git a/examples/lighting-app/p6/src/ZclCallbacks.cpp b/examples/lighting-app/infineon/psoc6/src/ZclCallbacks.cpp similarity index 100% rename from examples/lighting-app/p6/src/ZclCallbacks.cpp rename to examples/lighting-app/infineon/psoc6/src/ZclCallbacks.cpp diff --git a/examples/lighting-app/p6/src/main.cpp b/examples/lighting-app/infineon/psoc6/src/main.cpp similarity index 99% rename from examples/lighting-app/p6/src/main.cpp rename to examples/lighting-app/infineon/psoc6/src/main.cpp index 9c5daa77856b60..a2dcdae1cc63f1 100644 --- a/examples/lighting-app/p6/src/main.cpp +++ b/examples/lighting-app/infineon/psoc6/src/main.cpp @@ -35,7 +35,7 @@ #include "AppConfig.h" #include "cyhal_wdt.h" -#include "init_p6Platform.h" +#include "init_psoc6Platform.h" #include #ifdef HEAP_MONITORING diff --git a/examples/lighting-app/infineon/psoc6/third_party/connectedhomeip b/examples/lighting-app/infineon/psoc6/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/lighting-app/infineon/psoc6/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/lighting-app/p6/build_overrides b/examples/lighting-app/p6/build_overrides deleted file mode 120000 index e578e73312ebd1..00000000000000 --- a/examples/lighting-app/p6/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides \ No newline at end of file diff --git a/examples/lighting-app/p6/third_party/connectedhomeip b/examples/lighting-app/p6/third_party/connectedhomeip deleted file mode 120000 index c866b86874994d..00000000000000 --- a/examples/lighting-app/p6/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../.. \ No newline at end of file diff --git a/examples/lock-app/cyw30739/build_overrides b/examples/lock-app/cyw30739/build_overrides deleted file mode 120000 index e578e73312ebd1..00000000000000 --- a/examples/lock-app/cyw30739/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides \ No newline at end of file diff --git a/examples/lock-app/cyw30739/third_party/connectedhomeip b/examples/lock-app/cyw30739/third_party/connectedhomeip deleted file mode 120000 index c866b86874994d..00000000000000 --- a/examples/lock-app/cyw30739/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../.. \ No newline at end of file diff --git a/examples/lock-app/cyw30739/.gn b/examples/lock-app/infineon/cyw30739/.gn similarity index 100% rename from examples/lock-app/cyw30739/.gn rename to examples/lock-app/infineon/cyw30739/.gn diff --git a/examples/lock-app/cyw30739/BUILD.gn b/examples/lock-app/infineon/cyw30739/BUILD.gn similarity index 93% rename from examples/lock-app/cyw30739/BUILD.gn rename to examples/lock-app/infineon/cyw30739/BUILD.gn index 87f0e15e92bff3..8d0cc6333d32d9 100644 --- a/examples/lock-app/cyw30739/BUILD.gn +++ b/examples/lock-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/lock-app/cyw30739" -examples_plat_dir = "${chip_root}/examples/platform/cyw30739" +cyw30739_project_dir = "${chip_root}/examples/lock-app/infineon/cyw30739" +examples_plat_dir = "${chip_root}/examples/platform/infineon/cyw30739" declare_args() { setupPinCode = 20202021 diff --git a/examples/lock-app/cyw30739/README.md b/examples/lock-app/infineon/cyw30739/README.md similarity index 92% rename from examples/lock-app/cyw30739/README.md rename to examples/lock-app/infineon/cyw30739/README.md index 41a6a23598d3df..12ac917071ce55 100644 --- a/examples/lock-app/cyw30739/README.md +++ b/examples/lock-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/lock-app/cyw30739 out/lock-app + $ ./scripts/examples/gn_build_example.sh examples/lock-app/infineon/cyw30739 out/lock-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/lock-app/cyw30739 + $ cd ~/connectedhomeip/examples/lock-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/lock-app/cyw30739 + $ cd ~/connectedhomeip/examples/lock-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/lock-app/cyw30739 + $ cd ~/connectedhomeip/examples/lock-app/infineon/cyw30739 $ python3 out/debug/chip-cyw30739-lock-example.flash.py ``` diff --git a/examples/lighting-app/cyw30739/args.gni b/examples/lock-app/infineon/cyw30739/args.gni similarity index 93% rename from examples/lighting-app/cyw30739/args.gni rename to examples/lock-app/infineon/cyw30739/args.gni index 267c1db9b56817..ff653ee769356a 100644 --- a/examples/lighting-app/cyw30739/args.gni +++ b/examples/lock-app/infineon/cyw30739/args.gni @@ -13,7 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/src/platform/CYW30739/args.gni") +import("${chip_root}/src/platform/Infineon/CYW30739/args.gni") cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lock-app/infineon/cyw30739/build_overrides b/examples/lock-app/infineon/cyw30739/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/lock-app/infineon/cyw30739/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/lock-app/cyw30739/include/AppEvent.h b/examples/lock-app/infineon/cyw30739/include/AppEvent.h similarity index 100% rename from examples/lock-app/cyw30739/include/AppEvent.h rename to examples/lock-app/infineon/cyw30739/include/AppEvent.h diff --git a/examples/lock-app/cyw30739/include/AppShellCommands.h b/examples/lock-app/infineon/cyw30739/include/AppShellCommands.h similarity index 100% rename from examples/lock-app/cyw30739/include/AppShellCommands.h rename to examples/lock-app/infineon/cyw30739/include/AppShellCommands.h diff --git a/examples/lock-app/cyw30739/include/ButtonHandler.h b/examples/lock-app/infineon/cyw30739/include/ButtonHandler.h similarity index 100% rename from examples/lock-app/cyw30739/include/ButtonHandler.h rename to examples/lock-app/infineon/cyw30739/include/ButtonHandler.h diff --git a/examples/lock-app/cyw30739/include/CHIPProjectConfig.h b/examples/lock-app/infineon/cyw30739/include/CHIPProjectConfig.h similarity index 100% rename from examples/lock-app/cyw30739/include/CHIPProjectConfig.h rename to examples/lock-app/infineon/cyw30739/include/CHIPProjectConfig.h diff --git a/examples/lock-app/cyw30739/include/LockManager.h b/examples/lock-app/infineon/cyw30739/include/LockManager.h similarity index 100% rename from examples/lock-app/cyw30739/include/LockManager.h rename to examples/lock-app/infineon/cyw30739/include/LockManager.h diff --git a/examples/lock-app/cyw30739/include/chip_lock.h b/examples/lock-app/infineon/cyw30739/include/chip_lock.h similarity index 100% rename from examples/lock-app/cyw30739/include/chip_lock.h rename to examples/lock-app/infineon/cyw30739/include/chip_lock.h diff --git a/examples/lock-app/cyw30739/src/AppShellCommands.cpp b/examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp similarity index 100% rename from examples/lock-app/cyw30739/src/AppShellCommands.cpp rename to examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp diff --git a/examples/lock-app/cyw30739/src/ButtonHandler.cpp b/examples/lock-app/infineon/cyw30739/src/ButtonHandler.cpp similarity index 100% rename from examples/lock-app/cyw30739/src/ButtonHandler.cpp rename to examples/lock-app/infineon/cyw30739/src/ButtonHandler.cpp diff --git a/examples/lock-app/cyw30739/src/LockManager.cpp b/examples/lock-app/infineon/cyw30739/src/LockManager.cpp similarity index 100% rename from examples/lock-app/cyw30739/src/LockManager.cpp rename to examples/lock-app/infineon/cyw30739/src/LockManager.cpp diff --git a/examples/lock-app/cyw30739/src/ZclCallbacks.cpp b/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp similarity index 100% rename from examples/lock-app/cyw30739/src/ZclCallbacks.cpp rename to examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp diff --git a/examples/lock-app/cyw30739/src/main.cpp b/examples/lock-app/infineon/cyw30739/src/main.cpp similarity index 100% rename from examples/lock-app/cyw30739/src/main.cpp rename to examples/lock-app/infineon/cyw30739/src/main.cpp diff --git a/examples/lock-app/cyw30739/static_config.txt b/examples/lock-app/infineon/cyw30739/static_config.txt similarity index 100% rename from examples/lock-app/cyw30739/static_config.txt rename to examples/lock-app/infineon/cyw30739/static_config.txt diff --git a/examples/lock-app/infineon/cyw30739/third_party/connectedhomeip b/examples/lock-app/infineon/cyw30739/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/lock-app/infineon/cyw30739/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/lock-app/p6/.gn b/examples/lock-app/infineon/psoc6/.gn similarity index 100% rename from examples/lock-app/p6/.gn rename to examples/lock-app/infineon/psoc6/.gn diff --git a/examples/lock-app/p6/BUILD.gn b/examples/lock-app/infineon/psoc6/BUILD.gn similarity index 75% rename from examples/lock-app/p6/BUILD.gn rename to examples/lock-app/infineon/psoc6/BUILD.gn index b0db8078d672b5..83823b18d0eaff 100644 --- a/examples/lock-app/p6/BUILD.gn +++ b/examples/lock-app/infineon/psoc6/BUILD.gn @@ -14,17 +14,17 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") -import("//build_overrides/p6.gni") +import("//build_overrides/psoc6.gni") import("${build_root}/config/defaults.gni") import("${chip_root}/src/platform/device.gni") -import("${p6_sdk_build_root}/p6_executable.gni") -import("${p6_sdk_build_root}/p6_sdk.gni") +import("${psoc6_sdk_build_root}/psoc6_executable.gni") +import("${psoc6_sdk_build_root}/psoc6_sdk.gni") assert(current_os == "freertos") -p6_project_dir = "${chip_root}/examples/lock-app/p6" -examples_plat_dir = "${chip_root}/examples/platform/p6" +psoc6_project_dir = "${chip_root}/examples/lock-app/infineon/psoc6" +examples_plat_dir = "${chip_root}/examples/platform/infineon/psoc6" declare_args() { # Dump memory usage at link time. @@ -37,8 +37,8 @@ declare_args() { build_update_image = false } -config("p6_ota_config") { - linker_script = "${p6_sdk_root}/ota/cy8c6xxa_cm4_dual_ota_int.ld" +config("psoc6_ota_config") { + linker_script = "${psoc6_sdk_root}/ota/cy8c6xxa_cm4_dual_ota_int.ld" ldflags = [ "-T" + rebase_path(linker_script, root_build_dir) ] @@ -74,32 +74,33 @@ config("p6_ota_config") { defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=2" ] } } -p6_sdk_sources("lock_app_sdk_sources") { +psoc6_sdk_sources("lock_app_sdk_sources") { include_dirs = [ - "${chip_root}/src/platform/P6", - "${p6_project_dir}/include", + "${chip_root}/src/platform/PSOC6", + "${psoc6_project_dir}/include", "${examples_plat_dir}", ] defines = [ - "BOARD_ID=${p6_board}", + "BOARD_ID=${psoc6_board}", "P6_LOG_ENABLED=1", "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE=${setup_pin_code}", ] - sources = [ "${p6_project_dir}/include/CHIPProjectConfig.h" ] + sources = [ "${psoc6_project_dir}/include/CHIPProjectConfig.h" ] - public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ] + public_configs = + [ "${chip_root}/third_party/infineon/psoc6:psoc6_sdk_config" ] if (chip_enable_ota_requestor) { - public_configs += [ ":p6_ota_config" ] + public_configs += [ ":psoc6_ota_config" ] } } -p6_executable("lock_app") { +psoc6_executable("lock_app") { include_dirs = [] defines = [] - output_name = "chip-p6-lock-example.out" + output_name = "chip-psoc6-lock-example.out" public_deps = [ ":lock_app_sdk_sources", @@ -113,13 +114,13 @@ p6_executable("lock_app") { include_dirs += [ "include", "${examples_plat_dir}", - "${p6_project_dir}/include", + "${psoc6_project_dir}/include", ] sources = [ "${examples_plat_dir}/LEDWidget.cpp", - "${examples_plat_dir}/init_p6Platform.cpp", - "${p6_project_dir}/include/CHIPProjectConfig.h", + "${examples_plat_dir}/init_psoc6Platform.cpp", + "${psoc6_project_dir}/include/CHIPProjectConfig.h", "src/AppTask.cpp", "src/ButtonHandler.cpp", "src/LockManager.cpp", @@ -137,10 +138,10 @@ p6_executable("lock_app") { } } -group("p6") { +group("psoc6") { deps = [ ":lock_app" ] } group("default") { - deps = [ ":p6" ] + deps = [ ":psoc6" ] } diff --git a/examples/lock-app/p6/README.md b/examples/lock-app/infineon/psoc6/README.md similarity index 81% rename from examples/lock-app/p6/README.md rename to examples/lock-app/infineon/psoc6/README.md index 345782204802df..5046ce5c0343c7 100644 --- a/examples/lock-app/p6/README.md +++ b/examples/lock-app/infineon/psoc6/README.md @@ -1,10 +1,10 @@ -# Matter P6 Lock Example +# Matter PSoC6 Lock Example An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board.
-- [Matter P6 Lock Example](#chip-p6-lock-example) +- [Matter PSoC6 Lock Example](#chip-psoc6-lock-example) - [Introduction](#introduction) - [Building](#building) - [Flashing the Application](#flashing-the-application) @@ -21,13 +21,13 @@ An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board. ## Introduction -The P6 lock example provides a demonstration of a door lock control device, +The PSoC6 lock example provides a demonstration of a door lock control device, built using Matter and the Infineon Modustoolbox SDK. It can be controlled by a 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. @@ -37,8 +37,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): \$ sudo apt install gcc g++ clang ninja-build python @@ -51,7 +51,7 @@ will then join the network. * Build the example application: $ source scripts/activate.sh - $ scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-lock' build + $ scripts/build/build_examples.py --no-log-timestamps --target 'infineon-psoc6-lock' build - To delete generated executable, libraries and object files use: @@ -69,7 +69,7 @@ will then join the network. - On the command line: $ cd ~/connectedhomeip - $ python3 out/infineon-p6-lock/chip-p6-lock-example.flash.py + $ python3 out/infineon-psoc6-lock/chip-psoc6-lock-example.flash.py @@ -81,7 +81,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. @@ -139,6 +139,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/lock-app/p6/args.gni b/examples/lock-app/infineon/psoc6/args.gni similarity index 89% rename from examples/lock-app/p6/args.gni rename to examples/lock-app/infineon/psoc6/args.gni index a83cf1abdcb38e..62bdc6d3f6908c 100644 --- a/examples/lock-app/p6/args.gni +++ b/examples/lock-app/infineon/psoc6/args.gni @@ -14,7 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") -import("${chip_root}/src/platform/P6/args.gni") +import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") -p6_target_project = +psoc6_target_project = get_label_info(":lock_app_sdk_sources", "label_no_toolchain") diff --git a/examples/lock-app/infineon/psoc6/build_overrides b/examples/lock-app/infineon/psoc6/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/lock-app/infineon/psoc6/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/lock-app/p6/include/AppConfig.h b/examples/lock-app/infineon/psoc6/include/AppConfig.h similarity index 100% rename from examples/lock-app/p6/include/AppConfig.h rename to examples/lock-app/infineon/psoc6/include/AppConfig.h diff --git a/examples/lock-app/p6/include/AppEvent.h b/examples/lock-app/infineon/psoc6/include/AppEvent.h similarity index 100% rename from examples/lock-app/p6/include/AppEvent.h rename to examples/lock-app/infineon/psoc6/include/AppEvent.h diff --git a/examples/lock-app/p6/include/AppTask.h b/examples/lock-app/infineon/psoc6/include/AppTask.h similarity index 100% rename from examples/lock-app/p6/include/AppTask.h rename to examples/lock-app/infineon/psoc6/include/AppTask.h diff --git a/examples/lock-app/p6/include/ButtonHandler.h b/examples/lock-app/infineon/psoc6/include/ButtonHandler.h similarity index 100% rename from examples/lock-app/p6/include/ButtonHandler.h rename to examples/lock-app/infineon/psoc6/include/ButtonHandler.h diff --git a/examples/lock-app/p6/include/CHIPProjectConfig.h b/examples/lock-app/infineon/psoc6/include/CHIPProjectConfig.h similarity index 100% rename from examples/lock-app/p6/include/CHIPProjectConfig.h rename to examples/lock-app/infineon/psoc6/include/CHIPProjectConfig.h diff --git a/examples/lock-app/p6/include/LockManager.h b/examples/lock-app/infineon/psoc6/include/LockManager.h similarity index 100% rename from examples/lock-app/p6/include/LockManager.h rename to examples/lock-app/infineon/psoc6/include/LockManager.h diff --git a/examples/lock-app/p6/src/AppTask.cpp b/examples/lock-app/infineon/psoc6/src/AppTask.cpp similarity index 99% rename from examples/lock-app/p6/src/AppTask.cpp rename to examples/lock-app/infineon/psoc6/src/AppTask.cpp index f93438d47cbbf5..fe4baf6eb3f752 100644 --- a/examples/lock-app/p6/src/AppTask.cpp +++ b/examples/lock-app/infineon/psoc6/src/AppTask.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include @@ -56,7 +56,7 @@ #include #include #include -#include +#include using chip::BDXDownloader; using chip::CharSpan; diff --git a/examples/lock-app/p6/src/ButtonHandler.cpp b/examples/lock-app/infineon/psoc6/src/ButtonHandler.cpp similarity index 100% rename from examples/lock-app/p6/src/ButtonHandler.cpp rename to examples/lock-app/infineon/psoc6/src/ButtonHandler.cpp diff --git a/examples/lock-app/p6/src/LockManager.cpp b/examples/lock-app/infineon/psoc6/src/LockManager.cpp similarity index 99% rename from examples/lock-app/p6/src/LockManager.cpp rename to examples/lock-app/infineon/psoc6/src/LockManager.cpp index d83b984b789779..059f059f3735eb 100644 --- a/examples/lock-app/p6/src/LockManager.cpp +++ b/examples/lock-app/infineon/psoc6/src/LockManager.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include LockManager LockManager::sLock; diff --git a/examples/lock-app/p6/src/ZclCallbacks.cpp b/examples/lock-app/infineon/psoc6/src/ZclCallbacks.cpp similarity index 100% rename from examples/lock-app/p6/src/ZclCallbacks.cpp rename to examples/lock-app/infineon/psoc6/src/ZclCallbacks.cpp diff --git a/examples/lock-app/p6/src/main.cpp b/examples/lock-app/infineon/psoc6/src/main.cpp similarity index 99% rename from examples/lock-app/p6/src/main.cpp rename to examples/lock-app/infineon/psoc6/src/main.cpp index f998b3c4e54f54..8dc525dc8d717f 100644 --- a/examples/lock-app/p6/src/main.cpp +++ b/examples/lock-app/infineon/psoc6/src/main.cpp @@ -35,7 +35,7 @@ #include "AppConfig.h" #include "cyhal_wdt.h" -#include "init_p6Platform.h" +#include "init_psoc6Platform.h" #include #define MAIN_TASK_STACK_SIZE (4096) diff --git a/examples/lock-app/infineon/psoc6/third_party/connectedhomeip b/examples/lock-app/infineon/psoc6/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/lock-app/infineon/psoc6/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/lock-app/p6/build_overrides b/examples/lock-app/p6/build_overrides deleted file mode 120000 index 194ee0b812dc3d..00000000000000 --- a/examples/lock-app/p6/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides/ \ No newline at end of file diff --git a/examples/lock-app/p6/third_party/connectedhomeip b/examples/lock-app/p6/third_party/connectedhomeip deleted file mode 120000 index 11a54ed360106c..00000000000000 --- a/examples/lock-app/p6/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../../ \ No newline at end of file diff --git a/examples/ota-requestor-app/cyw30739/build_overrides b/examples/ota-requestor-app/cyw30739/build_overrides deleted file mode 120000 index e578e73312ebd1..00000000000000 --- a/examples/ota-requestor-app/cyw30739/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides \ No newline at end of file diff --git a/examples/ota-requestor-app/cyw30739/third_party/connectedhomeip b/examples/ota-requestor-app/cyw30739/third_party/connectedhomeip deleted file mode 120000 index c866b86874994d..00000000000000 --- a/examples/ota-requestor-app/cyw30739/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../.. \ No newline at end of file diff --git a/examples/ota-requestor-app/cyw30739/.gn b/examples/ota-requestor-app/infineon/cyw30739/.gn similarity index 100% rename from examples/ota-requestor-app/cyw30739/.gn rename to examples/ota-requestor-app/infineon/cyw30739/.gn diff --git a/examples/ota-requestor-app/cyw30739/BUILD.gn b/examples/ota-requestor-app/infineon/cyw30739/BUILD.gn similarity index 92% rename from examples/ota-requestor-app/cyw30739/BUILD.gn rename to examples/ota-requestor-app/infineon/cyw30739/BUILD.gn index b1ea6fde6aa876..3701330b0f7113 100644 --- a/examples/ota-requestor-app/cyw30739/BUILD.gn +++ b/examples/ota-requestor-app/infineon/cyw30739/BUILD.gn @@ -19,8 +19,9 @@ 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/ota-requestor-app/cyw30739" -examples_plat_dir = "${chip_root}/examples/platform/cyw30739" +cyw30739_project_dir = + "${chip_root}/examples/ota-requestor-app/infineon/cyw30739" +examples_plat_dir = "${chip_root}/examples/platform/infineon/cyw30739" declare_args() { setupPinCode = 20202021 diff --git a/examples/ota-requestor-app/cyw30739/README.md b/examples/ota-requestor-app/infineon/cyw30739/README.md similarity index 93% rename from examples/ota-requestor-app/cyw30739/README.md rename to examples/ota-requestor-app/infineon/cyw30739/README.md index 49737cd4f270fc..7ac0990009fbcd 100644 --- a/examples/ota-requestor-app/cyw30739/README.md +++ b/examples/ota-requestor-app/infineon/cyw30739/README.md @@ -33,7 +33,7 @@ dataset and CASE credentials are then provided. ```bash $ cd ~/connectedhomeip $ git submodule update --init - $ ./scripts/examples/gn_build_example.sh examples/ota-requestor-app/cyw30739 out/ota-requestor-app + $ ./scripts/examples/gn_build_example.sh examples/ota-requestor-app/infineon/cyw30739 out/ota-requestor-app ``` - To delete generated executable, libraries and object files use: @@ -46,7 +46,7 @@ dataset and CASE credentials are then provided. - OR use GN/Ninja directly ```bash - $ cd ~/connectedhomeip/examples/ota-requestor-app/cyw30739 + $ cd ~/connectedhomeip/examples/ota-requestor-app/infineon/cyw30739 $ git submodule update --init $ source third_party/connectedhomeip/scripts/activate.sh $ gn gen out/debug @@ -56,7 +56,7 @@ dataset and CASE credentials are then provided. - To delete generated executable, libraries and object files use: ```bash - $ cd ~/connectedhomeip/examples/ota-requestor-app/cyw30739 + $ cd ~/connectedhomeip/examples/ota-requestor-app/infineon/cyw30739 $ rm -rf out/ ``` @@ -76,7 +76,7 @@ Put the CYW30739 in to the recovery mode before running the flash script. - On the command line: ```bash - $ cd ~/connectedhomeip/examples/ota-requestor-app/cyw30739 + $ cd ~/connectedhomeip/examples/ota-requestor-app/infineon/cyw30739 $ python3 out/debug/chip-cyw30739-ota-requestor-example.flash.py ``` diff --git a/examples/ota-requestor-app/cyw30739/args.gni b/examples/ota-requestor-app/infineon/cyw30739/args.gni similarity index 92% rename from examples/ota-requestor-app/cyw30739/args.gni rename to examples/ota-requestor-app/infineon/cyw30739/args.gni index 8eda8fb616b4aa..37d8fa8d701fb9 100644 --- a/examples/ota-requestor-app/cyw30739/args.gni +++ b/examples/ota-requestor-app/infineon/cyw30739/args.gni @@ -13,7 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/src/platform/CYW30739/args.gni") +import("${chip_root}/src/platform/Infineon/CYW30739/args.gni") cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/ota-requestor-app/infineon/cyw30739/build_overrides b/examples/ota-requestor-app/infineon/cyw30739/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/ota-requestor-app/infineon/cyw30739/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/ota-requestor-app/cyw30739/include/CHIPProjectConfig.h b/examples/ota-requestor-app/infineon/cyw30739/include/CHIPProjectConfig.h similarity index 100% rename from examples/ota-requestor-app/cyw30739/include/CHIPProjectConfig.h rename to examples/ota-requestor-app/infineon/cyw30739/include/CHIPProjectConfig.h diff --git a/examples/ota-requestor-app/cyw30739/src/main.cpp b/examples/ota-requestor-app/infineon/cyw30739/src/main.cpp similarity index 100% rename from examples/ota-requestor-app/cyw30739/src/main.cpp rename to examples/ota-requestor-app/infineon/cyw30739/src/main.cpp diff --git a/examples/ota-requestor-app/cyw30739/static_config.txt b/examples/ota-requestor-app/infineon/cyw30739/static_config.txt similarity index 100% rename from examples/ota-requestor-app/cyw30739/static_config.txt rename to examples/ota-requestor-app/infineon/cyw30739/static_config.txt diff --git a/examples/ota-requestor-app/infineon/cyw30739/third_party/connectedhomeip b/examples/ota-requestor-app/infineon/cyw30739/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/ota-requestor-app/infineon/cyw30739/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/persistent-storage/p6/.gn b/examples/persistent-storage/infineon/psoc6/.gn similarity index 100% rename from examples/persistent-storage/p6/.gn rename to examples/persistent-storage/infineon/psoc6/.gn diff --git a/examples/persistent-storage/p6/BUILD.gn b/examples/persistent-storage/infineon/psoc6/BUILD.gn similarity index 63% rename from examples/persistent-storage/p6/BUILD.gn rename to examples/persistent-storage/infineon/psoc6/BUILD.gn index 944a2e07178056..d359f833815136 100644 --- a/examples/persistent-storage/p6/BUILD.gn +++ b/examples/persistent-storage/infineon/psoc6/BUILD.gn @@ -14,43 +14,44 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") -import("//build_overrides/p6.gni") +import("//build_overrides/psoc6.gni") import("${build_root}/config/defaults.gni") -import("${p6_sdk_build_root}/p6_executable.gni") -import("${p6_sdk_build_root}/p6_sdk.gni") +import("${psoc6_sdk_build_root}/psoc6_executable.gni") +import("${psoc6_sdk_build_root}/psoc6_sdk.gni") assert(current_os == "freertos") -p6_project_dir = "${chip_root}/examples/persistent-storage/p6" -examples_plat_dir = "${chip_root}/examples/platform/p6" +psoc6_project_dir = "${chip_root}/examples/persistent-storage/infineon/psoc6" +examples_plat_dir = "${chip_root}/examples/platform/infineon/psoc6" declare_args() { # Dump memory usage at link time. chip_print_memory_usage = false } -p6_sdk_sources("persistent_storage_app_sdk_sources") { +psoc6_sdk_sources("persistent_storage_app_sdk_sources") { include_dirs = [ - "${chip_root}/src/platform/P6", - "${p6_project_dir}/include", + "${chip_root}/src/platform/Infineon/PSOC6", + "${psoc6_project_dir}/include", "${examples_plat_dir}", ] defines = [ - "BOARD_ID=${p6_board}", + "BOARD_ID=${psoc6_board}", "P6_LOG_ENABLED=1", ] - sources = [ "${p6_project_dir}/include/CHIPProjectConfig.h" ] + sources = [ "${psoc6_project_dir}/include/CHIPProjectConfig.h" ] - public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ] + public_configs = + [ "${chip_root}/third_party/infineon/psoc6:psoc6_sdk_config" ] } -p6_executable("persistent_storage_app") { +psoc6_executable("persistent_storage_app") { include_dirs = [] defines = [] - output_name = "chip-p6-persistent-storage-example.out" + output_name = "chip-psoc6-persistent-storage-example.out" public_deps = [ ":persistent_storage_app_sdk_sources", @@ -61,14 +62,14 @@ p6_executable("persistent_storage_app") { include_dirs += [ "include", "${examples_plat_dir}", - "${p6_project_dir}/include", + "${psoc6_project_dir}/include", "${chip_root}/examples/persistent-storage", ] sources = [ "${chip_root}/examples/persistent-storage/KeyValueStorageTest.cpp", - "${examples_plat_dir}/init_p6Platform.cpp", - "${p6_project_dir}/include/CHIPProjectConfig.h", + "${examples_plat_dir}/init_psoc6Platform.cpp", + "${psoc6_project_dir}/include/CHIPProjectConfig.h", "main.cpp", ] @@ -82,10 +83,10 @@ p6_executable("persistent_storage_app") { } } -group("p6") { +group("psoc6") { deps = [ ":persistent_storage_app" ] } group("default") { - deps = [ ":p6" ] + deps = [ ":psoc6" ] } diff --git a/examples/persistent-storage/p6/README.md b/examples/persistent-storage/infineon/psoc6/README.md similarity index 65% rename from examples/persistent-storage/p6/README.md rename to examples/persistent-storage/infineon/psoc6/README.md index 8f30ecab6dbc39..19a32c60c85acf 100644 --- a/examples/persistent-storage/p6/README.md +++ b/examples/persistent-storage/infineon/psoc6/README.md @@ -1,12 +1,12 @@ -# CHIP P6 Persistent Storage Example +# CHIP PSoC6 Persistent Storage Example An example testing and demonstrating the key value storage API.
-- [CHIP P6 Persistent Storage Example](#chip-P6-persistent-storage-example) +- [CHIP PSoC6 Persistent Storage Example](#chip-PSoC6-persistent-storage-example) - [Introduction](#introduction) - - [P6](#P6) + - [PSoC6](#PSoC6) - [Building](#building) - [Flashing the Application](#flashing-the-application) @@ -23,12 +23,12 @@ to use the API. In the future this example can be moved into a unit test when available on all platforms. - + -## P6 +## PSoC6 -The P6 platform KVS is fully implemented, the KVS is enabled and configured by -providing a file during the init call. +The Infineon PSoC6 platform KVS is fully implemented, the KVS is enabled and +configured by providing a file during the init call. @@ -38,7 +38,7 @@ providing a file during the init call. $ git submodule update --init $ source third_party/connectedhomeip/scripts/activate.sh - $ ./scripts/examples/gn_p6_example.sh examples/persistent-storage/p6 out/persistent_storage_app_p6 + $ ./scripts/examples/gn_psoc6_example.sh examples/persistent-storage/infineon/psoc6 out/persistent_storage_app_psoc6 @@ -51,4 +51,4 @@ providing a file during the init call. - On the command line: $ cd ~/connectedhomeip - $ python3 out/persistent_storage_app_p6/chip-p6-persistent-storage-example.flash.py + $ python3 out/persistent_storage_app_psoc6/chip-psoc6-persistent-storage-example.flash.py diff --git a/examples/persistent-storage/p6/args.gni b/examples/persistent-storage/infineon/psoc6/args.gni similarity index 89% rename from examples/persistent-storage/p6/args.gni rename to examples/persistent-storage/infineon/psoc6/args.gni index 1c30d812940d3d..0b4443ebd96fcc 100644 --- a/examples/persistent-storage/p6/args.gni +++ b/examples/persistent-storage/infineon/psoc6/args.gni @@ -14,7 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") -import("${chip_root}/src/platform/P6/args.gni") +import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") -p6_target_project = +psoc6_target_project = get_label_info(":persistent_storage_app_sdk_sources", "label_no_toolchain") diff --git a/examples/persistent-storage/infineon/psoc6/build_overrides b/examples/persistent-storage/infineon/psoc6/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/persistent-storage/infineon/psoc6/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/persistent-storage/p6/include/AppConfig.h b/examples/persistent-storage/infineon/psoc6/include/AppConfig.h similarity index 100% rename from examples/persistent-storage/p6/include/AppConfig.h rename to examples/persistent-storage/infineon/psoc6/include/AppConfig.h diff --git a/examples/persistent-storage/p6/include/CHIPProjectConfig.h b/examples/persistent-storage/infineon/psoc6/include/CHIPProjectConfig.h similarity index 100% rename from examples/persistent-storage/p6/include/CHIPProjectConfig.h rename to examples/persistent-storage/infineon/psoc6/include/CHIPProjectConfig.h diff --git a/examples/persistent-storage/p6/main.cpp b/examples/persistent-storage/infineon/psoc6/main.cpp similarity index 98% rename from examples/persistent-storage/p6/main.cpp rename to examples/persistent-storage/infineon/psoc6/main.cpp index 03a5132aa73d99..104d63ffea0085 100644 --- a/examples/persistent-storage/p6/main.cpp +++ b/examples/persistent-storage/infineon/psoc6/main.cpp @@ -18,7 +18,7 @@ #include "AppConfig.h" #include "KeyValueStorageTest.h" -#include "init_p6Platform.h" +#include "init_psoc6Platform.h" #include #include #include diff --git a/examples/persistent-storage/infineon/psoc6/third_party/connectedhomeip b/examples/persistent-storage/infineon/psoc6/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/persistent-storage/infineon/psoc6/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/persistent-storage/p6/build_overrides b/examples/persistent-storage/p6/build_overrides deleted file mode 120000 index 194ee0b812dc3d..00000000000000 --- a/examples/persistent-storage/p6/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides/ \ No newline at end of file diff --git a/examples/persistent-storage/p6/third_party/connectedhomeip b/examples/persistent-storage/p6/third_party/connectedhomeip deleted file mode 120000 index c866b86874994d..00000000000000 --- a/examples/persistent-storage/p6/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../.. \ No newline at end of file diff --git a/examples/platform/cyw30739/BUILD.gn b/examples/platform/infineon/cyw30739/BUILD.gn similarity index 100% rename from examples/platform/cyw30739/BUILD.gn rename to examples/platform/infineon/cyw30739/BUILD.gn diff --git a/examples/platform/cyw30739/OTAConfig.cpp b/examples/platform/infineon/cyw30739/OTAConfig.cpp similarity index 97% rename from examples/platform/cyw30739/OTAConfig.cpp rename to examples/platform/infineon/cyw30739/OTAConfig.cpp index 05902c113aa451..206db24040f98c 100644 --- a/examples/platform/cyw30739/OTAConfig.cpp +++ b/examples/platform/infineon/cyw30739/OTAConfig.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include using namespace ::chip; using namespace ::chip::DeviceLayer; diff --git a/examples/platform/cyw30739/OTAConfig.h b/examples/platform/infineon/cyw30739/OTAConfig.h similarity index 100% rename from examples/platform/cyw30739/OTAConfig.h rename to examples/platform/infineon/cyw30739/OTAConfig.h diff --git a/examples/platform/cyw30739/args.gni b/examples/platform/infineon/cyw30739/args.gni similarity index 100% rename from examples/platform/cyw30739/args.gni rename to examples/platform/infineon/cyw30739/args.gni diff --git a/examples/platform/cyw30739/project_include/OpenThreadConfig.h b/examples/platform/infineon/cyw30739/project_include/OpenThreadConfig.h similarity index 100% rename from examples/platform/cyw30739/project_include/OpenThreadConfig.h rename to examples/platform/infineon/cyw30739/project_include/OpenThreadConfig.h diff --git a/examples/platform/p6/BUILD.gn b/examples/platform/infineon/psoc6/BUILD.gn similarity index 89% rename from examples/platform/p6/BUILD.gn rename to examples/platform/infineon/psoc6/BUILD.gn index 6d4842abf36dc1..d574f634a6e53e 100644 --- a/examples/platform/p6/BUILD.gn +++ b/examples/platform/infineon/psoc6/BUILD.gn @@ -13,9 +13,9 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/p6.gni") +import("//build_overrides/psoc6.gni") -import("${p6_sdk_build_root}/p6_sdk.gni") +import("${psoc6_sdk_build_root}/psoc6_sdk.gni") config("chip_examples_project_config") { include_dirs = [ "project_include" ] diff --git a/examples/platform/p6/LEDWidget.cpp b/examples/platform/infineon/psoc6/LEDWidget.cpp similarity index 100% rename from examples/platform/p6/LEDWidget.cpp rename to examples/platform/infineon/psoc6/LEDWidget.cpp diff --git a/examples/platform/p6/LEDWidget.h b/examples/platform/infineon/psoc6/LEDWidget.h similarity index 100% rename from examples/platform/p6/LEDWidget.h rename to examples/platform/infineon/psoc6/LEDWidget.h diff --git a/examples/platform/p6/args.gni b/examples/platform/infineon/psoc6/args.gni similarity index 100% rename from examples/platform/p6/args.gni rename to examples/platform/infineon/psoc6/args.gni diff --git a/examples/platform/p6/init_p6Platform.cpp b/examples/platform/infineon/psoc6/init_psoc6Platform.cpp similarity index 100% rename from examples/platform/p6/init_p6Platform.cpp rename to examples/platform/infineon/psoc6/init_psoc6Platform.cpp diff --git a/examples/platform/p6/init_p6Platform.h b/examples/platform/infineon/psoc6/init_psoc6Platform.h similarity index 100% rename from examples/platform/p6/init_p6Platform.h rename to examples/platform/infineon/psoc6/init_psoc6Platform.h diff --git a/gn_build.sh b/gn_build.sh index 0615a1833ef40d..18473f34f6d517 100755 --- a/gn_build.sh +++ b/gn_build.sh @@ -106,7 +106,7 @@ for arg; do enable_p6_builds=true) p6_builds_enabled=1 ;; - p6_board=*) + psoc6_board=*) p6_board_selected=1 ;; esac @@ -141,13 +141,13 @@ fi echo -# P6 Build setup +# PSoC6 Build setup if [[ -z "$p6_builds_enabled" ]]; then echo "Hint: Pass enable_p6_builds=true to this script to enable building for PSoC6-43012" else - p6_sdk_args="" + psoc6_sdk_args="" if [[ -z "$p6_board_selected" ]]; then - p6_sdk_args="p6_board=\"CY8CKIT-062S2-43012\"" + psoc6_sdk_args="psoc6_board=\"CY8CKIT-062S2-43012\"" fi fi diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index cb457e61a4b6a6..c9edb01794bca9 100755 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -520,7 +520,7 @@ def InfineonTargets(): builder.AppendVariant(name="ota", enable_ota_requestor=True) builder.AppendVariant(name="updateimage", update_image=True) - target = Target('infineon-p6', InfineonBuilder, board=InfineonBoard.P6BOARD) + target = Target('infineon-psoc6', InfineonBuilder, board=InfineonBoard.PSOC6BOARD) builder.targets.append(target.Extend('lock', app=InfineonApp.LOCK)) builder.targets.append(target.Extend('light', app=InfineonApp.LIGHT)) diff --git a/scripts/build/builders/cyw30739.py b/scripts/build/builders/cyw30739.py index 5d4470fef17535..b0347750c6593a 100644 --- a/scripts/build/builders/cyw30739.py +++ b/scripts/build/builders/cyw30739.py @@ -44,7 +44,7 @@ def AppNamePrefix(self): raise Exception("Unknown app type: %r" % self) def BuildRoot(self, root): - return os.path.join(root, "examples", self.ExampleName(), "cyw30739") + return os.path.join(root, "examples", self.ExampleName(), "infineon/cyw30739") class Cyw30739Board(Enum): diff --git a/scripts/build/builders/infineon.py b/scripts/build/builders/infineon.py index d0b73611a318cc..1783faefa0ef75 100644 --- a/scripts/build/builders/infineon.py +++ b/scripts/build/builders/infineon.py @@ -38,13 +38,13 @@ def ExampleName(self): def AppNamePrefix(self): if self == InfineonApp.LOCK: - return 'chip-p6-lock-example' + return 'chip-psoc6-lock-example' elif self == InfineonApp.LIGHT: - return 'chip-p6-lighting-example' + return 'chip-psoc6-lighting-example' elif self == InfineonApp.ALL_CLUSTERS: - return 'chip-p6-clusters-example' + return 'chip-psoc6-clusters-example' elif self == InfineonApp.ALL_CLUSTERS_MINIMAL: - return 'chip-p6-clusters-minimal-example' + return 'chip-psoc6-clusters-minimal-example' else: raise Exception('Unknown app type: %r' % self) @@ -61,14 +61,14 @@ def FlashBundleName(self): raise Exception('Unknown app type: %r' % self) def BuildRoot(self, root): - return os.path.join(root, 'examples', self.ExampleName(), 'p6') + return os.path.join(root, 'examples', self.ExampleName(), 'infineon/psoc6') class InfineonBoard(Enum): - P6BOARD = 1 + PSOC6BOARD = 1 def GnArgName(self): - if self == InfineonBoard.P6BOARD: + if self == InfineonBoard.PSOC6BOARD: return 'CY8CKIT-062S2-43012' @@ -78,7 +78,7 @@ def __init__(self, root, runner, app: InfineonApp = InfineonApp.LOCK, - board: InfineonBoard = InfineonBoard.P6BOARD, + board: InfineonBoard = InfineonBoard.PSOC6BOARD, enable_ota_requestor: bool = False, update_image: bool = False): super(InfineonBuilder, self).__init__( @@ -86,7 +86,7 @@ def __init__(self, runner=runner) self.app = app - self.extra_gn_options = ['p6_board="%s"' % board.GnArgName()] + self.extra_gn_options = ['psoc6_board="%s"' % board.GnArgName()] if enable_ota_requestor: self.extra_gn_options.append('chip_enable_ota_requestor=true') diff --git a/scripts/build/testdata/all_targets_except_host.txt b/scripts/build/testdata/all_targets_except_host.txt index fe98801f8ee5ac..ffbe1be7a1a4f2 100644 --- a/scripts/build/testdata/all_targets_except_host.txt +++ b/scripts/build/testdata/all_targets_except_host.txt @@ -178,22 +178,22 @@ imx-ota-provider-app imx-ota-provider-app-release imx-thermostat imx-thermostat-release -infineon-p6-all-clusters -infineon-p6-all-clusters-minimal -infineon-p6-all-clusters-minimal-ota (NOGLOB: Reduce default build variants) -infineon-p6-all-clusters-minimal-ota-updateimage (NOGLOB: Reduce default build variants) -infineon-p6-all-clusters-minimal-updateimage (NOGLOB: Reduce default build variants) -infineon-p6-all-clusters-ota (NOGLOB: Reduce default build variants) -infineon-p6-all-clusters-ota-updateimage (NOGLOB: Reduce default build variants) -infineon-p6-all-clusters-updateimage (NOGLOB: Reduce default build variants) -infineon-p6-light -infineon-p6-light-ota (NOGLOB: Reduce default build variants) -infineon-p6-light-ota-updateimage (NOGLOB: Reduce default build variants) -infineon-p6-light-updateimage (NOGLOB: Reduce default build variants) -infineon-p6-lock -infineon-p6-lock-ota (NOGLOB: Reduce default build variants) -infineon-p6-lock-ota-updateimage (NOGLOB: Reduce default build variants) -infineon-p6-lock-updateimage (NOGLOB: Reduce default build variants) +infineon-psoc6-all-clusters +infineon-psoc6-all-clusters-minimal +infineon-psoc6-all-clusters-minimal-ota (NOGLOB: Reduce default build variants) +infineon-psoc6-all-clusters-minimal-ota-updateimage (NOGLOB: Reduce default build variants) +infineon-psoc6-all-clusters-minimal-updateimage (NOGLOB: Reduce default build variants) +infineon-psoc6-all-clusters-ota (NOGLOB: Reduce default build variants) +infineon-psoc6-all-clusters-ota-updateimage (NOGLOB: Reduce default build variants) +infineon-psoc6-all-clusters-updateimage (NOGLOB: Reduce default build variants) +infineon-psoc6-light +infineon-psoc6-light-ota (NOGLOB: Reduce default build variants) +infineon-psoc6-light-ota-updateimage (NOGLOB: Reduce default build variants) +infineon-psoc6-light-updateimage (NOGLOB: Reduce default build variants) +infineon-psoc6-lock +infineon-psoc6-lock-ota (NOGLOB: Reduce default build variants) +infineon-psoc6-lock-ota-updateimage (NOGLOB: Reduce default build variants) +infineon-psoc6-lock-updateimage (NOGLOB: Reduce default build variants) k32w-light-ota-se (NOGLOB: Only on demand build) k32w-light-release-no-ota k32w-lock-low-power-release (NOGLOB: Only on demand build) diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt index 6cb3d25fcf67a2..7c255c2eb96d29 100644 --- a/scripts/build/testdata/build_all_except_host.txt +++ b/scripts/build/testdata/build_all_except_host.txt @@ -173,16 +173,16 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/shell/cc13x2x7_26x2x7 '--args=ti_sysconfig_root="TEST_TI_SYSCONFIG_ROOT"' {out}/cc13x2x7_26x2x7-shell # Generating cyw30739-cyw930739m2evb_01-light -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/cyw30739 {out}/cyw30739-cyw930739m2evb_01-light +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/infineon/cyw30739 {out}/cyw30739-cyw930739m2evb_01-light # Generating cyw30739-cyw930739m2evb_01-lock -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/cyw30739 {out}/cyw30739-cyw930739m2evb_01-lock +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/infineon/cyw30739 {out}/cyw30739-cyw930739m2evb_01-lock # Generating cyw30739-cyw930739m2evb_01-ota-requestor -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/ota-requestor-app/cyw30739 {out}/cyw30739-cyw930739m2evb_01-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/ota-requestor-app/infineon/cyw30739 {out}/cyw30739-cyw930739m2evb_01-ota-requestor # Generating cyw30739-cyw930739m2evb_01-ota-requestor-no-progress-logging -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/ota-requestor-app/cyw30739 --args=chip_progress_logging=false {out}/cyw30739-cyw930739m2evb_01-ota-requestor-no-progress-logging +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/ota-requestor-app/infineon/cyw30739 --args=chip_progress_logging=false {out}/cyw30739-cyw930739m2evb_01-ota-requestor-no-progress-logging # Generating efr32-brd4161a-light gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-light @@ -843,53 +843,53 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa # Generating imx-thermostat-release gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/thermostat/linux '--args=treat_warnings_as_errors=false target_os="linux" target_cpu="arm64" arm_arch="armv8-a" import("//build_overrides/build.gni") custom_toolchain="${build_root}/toolchain/custom" sysroot="IMX_SDK_ROOT/sysroots/cortexa53-crypto-poky-linux" target_cflags=[ "-DCHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME=\"mlan0\"", "-DCHIP_DEVICE_CONFIG_LINUX_DHCPC_CMD=\"udhcpc -b -i %s \"" ] target_cc="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-gcc" target_cxx="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-g++" target_ar="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-ar" is_debug=false' {out}/imx-thermostat-release -# Generating infineon-p6-all-clusters -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/p6 '--args=p6_board="CY8CKIT-062S2-43012"' {out}/infineon-p6-all-clusters +# Generating infineon-psoc6-all-clusters +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012"' {out}/infineon-psoc6-all-clusters -# Generating infineon-p6-all-clusters-minimal -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/p6 '--args=p6_board="CY8CKIT-062S2-43012"' {out}/infineon-p6-all-clusters-minimal +# Generating infineon-psoc6-all-clusters-minimal +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012"' {out}/infineon-psoc6-all-clusters-minimal -# Generating infineon-p6-all-clusters-minimal-ota -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true' {out}/infineon-p6-all-clusters-minimal-ota +# Generating infineon-psoc6-all-clusters-minimal-ota +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true' {out}/infineon-psoc6-all-clusters-minimal-ota -# Generating infineon-p6-all-clusters-minimal-ota-updateimage -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true build_update_image=true' {out}/infineon-p6-all-clusters-minimal-ota-updateimage +# Generating infineon-psoc6-all-clusters-minimal-ota-updateimage +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true build_update_image=true' {out}/infineon-psoc6-all-clusters-minimal-ota-updateimage -# Generating infineon-p6-all-clusters-minimal-updateimage -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" build_update_image=true' {out}/infineon-p6-all-clusters-minimal-updateimage +# Generating infineon-psoc6-all-clusters-minimal-updateimage +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" build_update_image=true' {out}/infineon-psoc6-all-clusters-minimal-updateimage -# Generating infineon-p6-all-clusters-ota -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true' {out}/infineon-p6-all-clusters-ota +# Generating infineon-psoc6-all-clusters-ota +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true' {out}/infineon-psoc6-all-clusters-ota -# Generating infineon-p6-all-clusters-ota-updateimage -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true build_update_image=true' {out}/infineon-p6-all-clusters-ota-updateimage +# Generating infineon-psoc6-all-clusters-ota-updateimage +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true build_update_image=true' {out}/infineon-psoc6-all-clusters-ota-updateimage -# Generating infineon-p6-all-clusters-updateimage -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" build_update_image=true' {out}/infineon-p6-all-clusters-updateimage +# Generating infineon-psoc6-all-clusters-updateimage +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" build_update_image=true' {out}/infineon-psoc6-all-clusters-updateimage -# Generating infineon-p6-light -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/p6 '--args=p6_board="CY8CKIT-062S2-43012"' {out}/infineon-p6-light +# Generating infineon-psoc6-light +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012"' {out}/infineon-psoc6-light -# Generating infineon-p6-light-ota -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true' {out}/infineon-p6-light-ota +# Generating infineon-psoc6-light-ota +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true' {out}/infineon-psoc6-light-ota -# Generating infineon-p6-light-ota-updateimage -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true build_update_image=true' {out}/infineon-p6-light-ota-updateimage +# Generating infineon-psoc6-light-ota-updateimage +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true build_update_image=true' {out}/infineon-psoc6-light-ota-updateimage -# Generating infineon-p6-light-updateimage -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" build_update_image=true' {out}/infineon-p6-light-updateimage +# Generating infineon-psoc6-light-updateimage +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" build_update_image=true' {out}/infineon-psoc6-light-updateimage -# Generating infineon-p6-lock -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/p6 '--args=p6_board="CY8CKIT-062S2-43012"' {out}/infineon-p6-lock +# Generating infineon-psoc6-lock +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012"' {out}/infineon-psoc6-lock -# Generating infineon-p6-lock-ota -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true' {out}/infineon-p6-lock-ota +# Generating infineon-psoc6-lock-ota +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true' {out}/infineon-psoc6-lock-ota -# Generating infineon-p6-lock-ota-updateimage -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true build_update_image=true' {out}/infineon-p6-lock-ota-updateimage +# Generating infineon-psoc6-lock-ota-updateimage +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" chip_enable_ota_requestor=true build_update_image=true' {out}/infineon-psoc6-lock-ota-updateimage -# Generating infineon-p6-lock-updateimage -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/p6 '--args=p6_board="CY8CKIT-062S2-43012" build_update_image=true' {out}/infineon-p6-lock-updateimage +# Generating infineon-psoc6-lock-updateimage +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/infineon/psoc6 '--args=psoc6_board="CY8CKIT-062S2-43012" build_update_image=true' {out}/infineon-psoc6-lock-updateimage {root}/third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh @@ -2103,53 +2103,53 @@ ninja -C {out}/imx-thermostat # Building imx-thermostat-release ninja -C {out}/imx-thermostat-release -# Building infineon-p6-all-clusters -ninja -C {out}/infineon-p6-all-clusters +# Building infineon-psoc6-all-clusters +ninja -C {out}/infineon-psoc6-all-clusters -# Building infineon-p6-all-clusters-minimal -ninja -C {out}/infineon-p6-all-clusters-minimal +# Building infineon-psoc6-all-clusters-minimal +ninja -C {out}/infineon-psoc6-all-clusters-minimal -# Building infineon-p6-all-clusters-minimal-ota -ninja -C {out}/infineon-p6-all-clusters-minimal-ota +# Building infineon-psoc6-all-clusters-minimal-ota +ninja -C {out}/infineon-psoc6-all-clusters-minimal-ota -# Building infineon-p6-all-clusters-minimal-ota-updateimage -ninja -C {out}/infineon-p6-all-clusters-minimal-ota-updateimage +# Building infineon-psoc6-all-clusters-minimal-ota-updateimage +ninja -C {out}/infineon-psoc6-all-clusters-minimal-ota-updateimage -# Building infineon-p6-all-clusters-minimal-updateimage -ninja -C {out}/infineon-p6-all-clusters-minimal-updateimage +# Building infineon-psoc6-all-clusters-minimal-updateimage +ninja -C {out}/infineon-psoc6-all-clusters-minimal-updateimage -# Building infineon-p6-all-clusters-ota -ninja -C {out}/infineon-p6-all-clusters-ota +# Building infineon-psoc6-all-clusters-ota +ninja -C {out}/infineon-psoc6-all-clusters-ota -# Building infineon-p6-all-clusters-ota-updateimage -ninja -C {out}/infineon-p6-all-clusters-ota-updateimage +# Building infineon-psoc6-all-clusters-ota-updateimage +ninja -C {out}/infineon-psoc6-all-clusters-ota-updateimage -# Building infineon-p6-all-clusters-updateimage -ninja -C {out}/infineon-p6-all-clusters-updateimage +# Building infineon-psoc6-all-clusters-updateimage +ninja -C {out}/infineon-psoc6-all-clusters-updateimage -# Building infineon-p6-light -ninja -C {out}/infineon-p6-light +# Building infineon-psoc6-light +ninja -C {out}/infineon-psoc6-light -# Building infineon-p6-light-ota -ninja -C {out}/infineon-p6-light-ota +# Building infineon-psoc6-light-ota +ninja -C {out}/infineon-psoc6-light-ota -# Building infineon-p6-light-ota-updateimage -ninja -C {out}/infineon-p6-light-ota-updateimage +# Building infineon-psoc6-light-ota-updateimage +ninja -C {out}/infineon-psoc6-light-ota-updateimage -# Building infineon-p6-light-updateimage -ninja -C {out}/infineon-p6-light-updateimage +# Building infineon-psoc6-light-updateimage +ninja -C {out}/infineon-psoc6-light-updateimage -# Building infineon-p6-lock -ninja -C {out}/infineon-p6-lock +# Building infineon-psoc6-lock +ninja -C {out}/infineon-psoc6-lock -# Building infineon-p6-lock-ota -ninja -C {out}/infineon-p6-lock-ota +# Building infineon-psoc6-lock-ota +ninja -C {out}/infineon-psoc6-lock-ota -# Building infineon-p6-lock-ota-updateimage -ninja -C {out}/infineon-p6-lock-ota-updateimage +# Building infineon-psoc6-lock-ota-updateimage +ninja -C {out}/infineon-psoc6-lock-ota-updateimage -# Building infineon-p6-lock-updateimage -ninja -C {out}/infineon-p6-lock-updateimage +# Building infineon-psoc6-lock-updateimage +ninja -C {out}/infineon-psoc6-lock-updateimage # Building k32w-light-ota-se ninja -C {out}/k32w-light-ota-se diff --git a/scripts/build/testdata/glob_star_targets_except_host.txt b/scripts/build/testdata/glob_star_targets_except_host.txt index d7090c2c52ccfd..9d7a22bfc4c937 100644 --- a/scripts/build/testdata/glob_star_targets_except_host.txt +++ b/scripts/build/testdata/glob_star_targets_except_host.txt @@ -72,10 +72,10 @@ imx-ota-provider-app imx-ota-provider-app-release imx-thermostat imx-thermostat-release -infineon-p6-all-clusters -infineon-p6-all-clusters-minimal -infineon-p6-light -infineon-p6-lock +infineon-psoc6-all-clusters +infineon-psoc6-all-clusters-minimal +infineon-psoc6-light +infineon-psoc6-lock k32w-light-release-no-ota k32w-lock-release k32w-shell-release diff --git a/scripts/checkout_submodules.py b/scripts/checkout_submodules.py index b150b8df71253e..c98f54c249e418 100755 --- a/scripts/checkout_submodules.py +++ b/scripts/checkout_submodules.py @@ -30,15 +30,14 @@ 'bl602', 'cc13x2_26x2', 'cc32xx', - 'cyw30739', 'darwin', 'efr32', 'esp32', + 'infineon', 'k32w0', 'linux', 'mbed', 'nrfconnect', - 'p6', 'qpg', 'telink', 'tizen', diff --git a/scripts/examples/gn_p6_example.sh b/scripts/examples/gn_psoc6_example.sh similarity index 95% rename from scripts/examples/gn_p6_example.sh rename to scripts/examples/gn_psoc6_example.sh index 746c2d743779e4..403063ff575f0d 100755 --- a/scripts/examples/gn_p6_example.sh +++ b/scripts/examples/gn_psoc6_example.sh @@ -43,7 +43,7 @@ env EXAMPLE_DIR=$1 shift OUTPUT_DIR=out/example_app -P6_BOARD=CY8CKIT-062S2-43012 +PSOC6_BOARD=CY8CKIT-062S2-43012 if [[ ! -z "$1" ]]; then OUTPUT_DIR=$1 @@ -70,7 +70,7 @@ for arg; do esac done -gn gen --check --fail-on-unused-args "$OUTPUT_DIR" --root="$EXAMPLE_DIR" --args="p6_board=\"$P6_BOARD\" ${GN_ARGS[*]}" +gn gen --check --fail-on-unused-args "$OUTPUT_DIR" --root="$EXAMPLE_DIR" --args="psoc6_board=\"$PSOC6_BOARD\" ${GN_ARGS[*]}" ninja -C "$OUTPUT_DIR" "${NINJA_ARGS[@]}" #print stats arm-none-eabi-size -A "$OUTPUT_DIR"/*.out diff --git a/scripts/flashing/p6_firmware_utils.py b/scripts/flashing/psoc6_firmware_utils.py similarity index 90% rename from scripts/flashing/p6_firmware_utils.py rename to scripts/flashing/psoc6_firmware_utils.py index 0fe247247b4070..aeef78030a1d74 100755 --- a/scripts/flashing/p6_firmware_utils.py +++ b/scripts/flashing/psoc6_firmware_utils.py @@ -12,18 +12,18 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -"""Flash an P6 device. +"""Flash an Infineon PSoC6 device. This is layered so that a caller can perform individual operations through an `Flasher` instance, or operations according to a command line. For `Flasher`, see the class documentation. For the parse_command() interface or standalone execution: -usage: p6_firmware_utils.py [-h] [--verbose] [--erase] [--application FILE] +usage: psoc6_firmware_utils.py [-h] [--verbose] [--erase] [--application FILE] [--verify_application] [--reset] [--skip_reset] [--device DEVICE] -Flash P6 device +Flash PSoC6 device optional arguments: -h, --help show this help message and exit @@ -64,7 +64,7 @@ "-C", {'option': 'sdk_path'}, ['TARGET={device}'], - ['CY_OPENOCD_PROGRAM_IMG=../../../{application}'], + ['CY_OPENOCD_PROGRAM_IMG=../../../../{application}'], {'option': 'mtb_target'} ], 'verify': ['{make}', '--version'], @@ -77,15 +77,15 @@ }, 'device': { 'help': 'Device family or platform to target', - 'default': 'P6', + 'default': 'PSoC6', 'alias': ['-d'], 'argparse': { 'metavar': 'DEVICE' }, }, 'sdk_path': { - 'help': 'Path to p6 sdk', - 'default': 'third_party/p6/p6_sdk', + 'help': 'Path to psoc6 sdk', + 'default': 'third_party/infineon/psoc6/psoc6_sdk', 'alias': ['-p'], 'argparse': { 'metavar': 'SDK_PATH' @@ -96,10 +96,10 @@ class Flasher(firmware_utils.Flasher): - """Manage P6 flashing.""" + """Manage PSoC6 flashing.""" def __init__(self, **options): - super().__init__(platform='P6', module=__name__, **options) + super().__init__(platform='PSOC6', module=__name__, **options) self.define_options(P6_OPTIONS) def erase(self): diff --git a/scripts/tools/check_includes_config.py b/scripts/tools/check_includes_config.py index 30b66bcd01fddd..3ab64a2f9250be 100644 --- a/scripts/tools/check_includes_config.py +++ b/scripts/tools/check_includes_config.py @@ -40,7 +40,7 @@ '/platform/Ameba/', '/platform/android/', '/platform/Beken/', - '/platform/CYW30739/', + '/platform/Infineon/CYW30739/', '/platform/Darwin/', '/platform/EFR32/', '/platform/ESP32/', @@ -48,7 +48,7 @@ '/platform/Linux/', '/platform/nxp/', '/platform/Tizen/', - '/platform/P6/', + '/platform/Infineon/PSOC6/', '/platform/bouffalolab/BL602', '/platform/webos/', r'POSIX\.h$', diff --git a/src/lwip/BUILD.gn b/src/lwip/BUILD.gn index 4490159793bbd0..830e82b3cb0e75 100644 --- a/src/lwip/BUILD.gn +++ b/src/lwip/BUILD.gn @@ -32,7 +32,7 @@ assert(lwip_platform == "external" || lwip_platform == "standalone" || lwip_platform == "cc13x2_26x2" || lwip_platform == "cc32xx" || lwip_platform == "efr32" || lwip_platform == "k32w0" || lwip_platform == "qpg" || lwip_platform == "mbed" || - lwip_platform == "p6" || lwip_platform == "cyw30739" || + lwip_platform == "psoc6" || lwip_platform == "cyw30739" || lwip_platform == "bl602" || lwip_platform == "mw320", "Unsupported lwIP platform: ${lwip_platform}") @@ -54,8 +54,8 @@ if (lwip_platform == "cc13x2_26x2") { import("${qpg_sdk_build_root}/qpg_sdk.gni") } else if (lwip_platform == "k32w0") { import("//build_overrides/k32w0_sdk.gni") -} else if (lwip_platform == "p6") { - import("//build_overrides/p6.gni") +} else if (lwip_platform == "psoc6") { + import("//build_overrides/psoc6.gni") } else if (lwip_platform == "cyw30739") { import("//build_overrides/cyw30739_sdk.gni") } else if (lwip_platform == "bl602") { @@ -95,11 +95,11 @@ if (current_os == "zephyr" || current_os == "mbed") { group("all") { deps = [ ":lwip" ] } -} else if (lwip_platform == "p6") { +} else if (lwip_platform == "psoc6") { group("lwip") { public_deps = [ ":lwip_buildconfig" ] public_configs = [ "${chip_root}/src:includes" ] - public_configs += [ "${p6_sdk_build_root}:p6_sdk_config" ] + public_configs += [ "${psoc6_sdk_build_root}:psoc6_sdk_config" ] } group("all") { diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn index 31e25b41a6a5df..e5758593538fde 100644 --- a/src/platform/BUILD.gn +++ b/src/platform/BUILD.gn @@ -172,10 +172,10 @@ if (chip_device_platform != "none" && chip_device_platform != "external") { "CHIP_DEVICE_LAYER_TARGET_ESP32=1", "CHIP_DEVICE_LAYER_TARGET=ESP32", ] - } else if (chip_device_platform == "p6") { + } else if (chip_device_platform == "psoc6") { defines += [ - "CHIP_DEVICE_LAYER_TARGET_P6=1", - "CHIP_DEVICE_LAYER_TARGET=P6", + "CHIP_DEVICE_LAYER_TARGET_PSOC6=1", + "CHIP_DEVICE_LAYER_TARGET=Infineon/PSOC6", ] } else if (chip_device_platform == "linux") { defines += [ @@ -242,7 +242,7 @@ if (chip_device_platform != "none" && chip_device_platform != "external") { } else if (chip_device_platform == "cyw30739") { defines += [ "CHIP_DEVICE_LAYER_TARGET_CYW30739=1", - "CHIP_DEVICE_LAYER_TARGET=CYW30739", + "CHIP_DEVICE_LAYER_TARGET=Infineon/CYW30739", ] } else if (chip_device_platform == "webos") { defines += [ @@ -421,8 +421,8 @@ if (chip_device_platform != "none") { _platform_target = "android" } else if (chip_device_platform == "external") { _platform_target = chip_platform_target - } else if (chip_device_platform == "p6") { - _platform_target = "P6" + } else if (chip_device_platform == "psoc6") { + _platform_target = "Infineon/PSOC6" } else if (chip_device_platform == "ameba") { _platform_target = "Ameba" } else if (chip_device_platform == "webos") { @@ -432,7 +432,7 @@ if (chip_device_platform != "none") { } else if (chip_device_platform == "fake") { _platform_target = "fake" } else if (chip_device_platform == "cyw30739") { - _platform_target = "CYW30739" + _platform_target = "Infineon/CYW30739" } else if (chip_device_platform == "mw320") { _platform_target = "nxp/mw320" } else if (chip_device_platform == "zephyr") { diff --git a/src/platform/CYW30739/BLEManagerImpl.cpp b/src/platform/Infineon/CYW30739/BLEManagerImpl.cpp similarity index 100% rename from src/platform/CYW30739/BLEManagerImpl.cpp rename to src/platform/Infineon/CYW30739/BLEManagerImpl.cpp diff --git a/src/platform/CYW30739/BLEManagerImpl.h b/src/platform/Infineon/CYW30739/BLEManagerImpl.h similarity index 100% rename from src/platform/CYW30739/BLEManagerImpl.h rename to src/platform/Infineon/CYW30739/BLEManagerImpl.h diff --git a/src/platform/CYW30739/BUILD.gn b/src/platform/Infineon/CYW30739/BUILD.gn similarity index 94% rename from src/platform/CYW30739/BUILD.gn rename to src/platform/Infineon/CYW30739/BUILD.gn index 50d3f464057e74..623cd188bd8343 100644 --- a/src/platform/CYW30739/BUILD.gn +++ b/src/platform/Infineon/CYW30739/BUILD.gn @@ -24,7 +24,7 @@ if (chip_enable_openthread) { static_library("CYW30739") { sources = [ - "../SingletonConfigurationManager.cpp", + "../../SingletonConfigurationManager.cpp", "BLEManagerImpl.cpp", "BLEManagerImpl.h", "BlePlatformConfig.h", @@ -67,7 +67,7 @@ static_library("CYW30739") { if (chip_enable_openthread) { sources += [ - "../OpenThread/OpenThreadUtils.cpp", + "../../OpenThread/OpenThreadUtils.cpp", "ThreadStackManagerImpl.cpp", "ThreadStackManagerImpl.h", ] @@ -85,7 +85,7 @@ static_library("CYW30739") { } if (chip_mdns == "platform") { - sources += [ "../OpenThread/DnssdImpl.cpp" ] + sources += [ "../../OpenThread/DnssdImpl.cpp" ] deps += [ "${chip_root}/src/lib/dnssd:platform_header" ] } diff --git a/src/platform/CYW30739/BlePlatformConfig.h b/src/platform/Infineon/CYW30739/BlePlatformConfig.h similarity index 100% rename from src/platform/CYW30739/BlePlatformConfig.h rename to src/platform/Infineon/CYW30739/BlePlatformConfig.h diff --git a/src/platform/CYW30739/CHIPDevicePlatformConfig.h b/src/platform/Infineon/CYW30739/CHIPDevicePlatformConfig.h similarity index 100% rename from src/platform/CYW30739/CHIPDevicePlatformConfig.h rename to src/platform/Infineon/CYW30739/CHIPDevicePlatformConfig.h diff --git a/src/platform/CYW30739/CHIPDevicePlatformEvent.h b/src/platform/Infineon/CYW30739/CHIPDevicePlatformEvent.h similarity index 100% rename from src/platform/CYW30739/CHIPDevicePlatformEvent.h rename to src/platform/Infineon/CYW30739/CHIPDevicePlatformEvent.h diff --git a/src/platform/CYW30739/CHIPPlatformConfig.h b/src/platform/Infineon/CYW30739/CHIPPlatformConfig.h similarity index 100% rename from src/platform/CYW30739/CHIPPlatformConfig.h rename to src/platform/Infineon/CYW30739/CHIPPlatformConfig.h diff --git a/src/platform/CYW30739/CYW30739Config.cpp b/src/platform/Infineon/CYW30739/CYW30739Config.cpp similarity index 99% rename from src/platform/CYW30739/CYW30739Config.cpp rename to src/platform/Infineon/CYW30739/CYW30739Config.cpp index 2d84fd0703c798..651b4fb3cb40b4 100644 --- a/src/platform/CYW30739/CYW30739Config.cpp +++ b/src/platform/Infineon/CYW30739/CYW30739Config.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include namespace chip { diff --git a/src/platform/CYW30739/CYW30739Config.h b/src/platform/Infineon/CYW30739/CYW30739Config.h similarity index 100% rename from src/platform/CYW30739/CYW30739Config.h rename to src/platform/Infineon/CYW30739/CYW30739Config.h diff --git a/src/platform/CYW30739/ConfigurationManagerImpl.cpp b/src/platform/Infineon/CYW30739/ConfigurationManagerImpl.cpp similarity index 99% rename from src/platform/CYW30739/ConfigurationManagerImpl.cpp rename to src/platform/Infineon/CYW30739/ConfigurationManagerImpl.cpp index a706ceec55e492..5489a58441c3ff 100644 --- a/src/platform/CYW30739/ConfigurationManagerImpl.cpp +++ b/src/platform/Infineon/CYW30739/ConfigurationManagerImpl.cpp @@ -27,9 +27,9 @@ #include #include -#include #include #include +#include #include namespace chip { diff --git a/src/platform/CYW30739/ConfigurationManagerImpl.h b/src/platform/Infineon/CYW30739/ConfigurationManagerImpl.h similarity index 100% rename from src/platform/CYW30739/ConfigurationManagerImpl.h rename to src/platform/Infineon/CYW30739/ConfigurationManagerImpl.h diff --git a/src/platform/CYW30739/ConnectivityManagerImpl.cpp b/src/platform/Infineon/CYW30739/ConnectivityManagerImpl.cpp similarity index 100% rename from src/platform/CYW30739/ConnectivityManagerImpl.cpp rename to src/platform/Infineon/CYW30739/ConnectivityManagerImpl.cpp diff --git a/src/platform/CYW30739/ConnectivityManagerImpl.h b/src/platform/Infineon/CYW30739/ConnectivityManagerImpl.h similarity index 100% rename from src/platform/CYW30739/ConnectivityManagerImpl.h rename to src/platform/Infineon/CYW30739/ConnectivityManagerImpl.h diff --git a/src/platform/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp similarity index 100% rename from src/platform/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp rename to src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp diff --git a/src/platform/CYW30739/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.h similarity index 100% rename from src/platform/CYW30739/DeviceNetworkProvisioningDelegateImpl.h rename to src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.h diff --git a/src/platform/CYW30739/DiagnosticDataProviderImpl.cpp b/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp similarity index 98% rename from src/platform/CYW30739/DiagnosticDataProviderImpl.cpp rename to src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp index 2af3114c1ad148..2deec6df8b4646 100644 --- a/src/platform/CYW30739/DiagnosticDataProviderImpl.cpp +++ b/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp @@ -23,8 +23,8 @@ #include -#include #include +#include #include #include diff --git a/src/platform/CYW30739/DiagnosticDataProviderImpl.h b/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.h similarity index 100% rename from src/platform/CYW30739/DiagnosticDataProviderImpl.h rename to src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.h diff --git a/src/platform/CYW30739/InetPlatformConfig.h b/src/platform/Infineon/CYW30739/InetPlatformConfig.h similarity index 100% rename from src/platform/CYW30739/InetPlatformConfig.h rename to src/platform/Infineon/CYW30739/InetPlatformConfig.h diff --git a/src/platform/CYW30739/KeyValueStoreManagerImpl.cpp b/src/platform/Infineon/CYW30739/KeyValueStoreManagerImpl.cpp similarity index 100% rename from src/platform/CYW30739/KeyValueStoreManagerImpl.cpp rename to src/platform/Infineon/CYW30739/KeyValueStoreManagerImpl.cpp diff --git a/src/platform/CYW30739/KeyValueStoreManagerImpl.h b/src/platform/Infineon/CYW30739/KeyValueStoreManagerImpl.h similarity index 100% rename from src/platform/CYW30739/KeyValueStoreManagerImpl.h rename to src/platform/Infineon/CYW30739/KeyValueStoreManagerImpl.h diff --git a/src/platform/CYW30739/Logging.cpp b/src/platform/Infineon/CYW30739/Logging.cpp similarity index 100% rename from src/platform/CYW30739/Logging.cpp rename to src/platform/Infineon/CYW30739/Logging.cpp diff --git a/src/platform/CYW30739/OTAImageProcessorImpl.cpp b/src/platform/Infineon/CYW30739/OTAImageProcessorImpl.cpp similarity index 100% rename from src/platform/CYW30739/OTAImageProcessorImpl.cpp rename to src/platform/Infineon/CYW30739/OTAImageProcessorImpl.cpp diff --git a/src/platform/CYW30739/OTAImageProcessorImpl.h b/src/platform/Infineon/CYW30739/OTAImageProcessorImpl.h similarity index 100% rename from src/platform/CYW30739/OTAImageProcessorImpl.h rename to src/platform/Infineon/CYW30739/OTAImageProcessorImpl.h diff --git a/src/platform/CYW30739/PlatformManagerImpl.cpp b/src/platform/Infineon/CYW30739/PlatformManagerImpl.cpp similarity index 99% rename from src/platform/CYW30739/PlatformManagerImpl.cpp rename to src/platform/Infineon/CYW30739/PlatformManagerImpl.cpp index 41e91ea0a205a6..c2da0a1efc8414 100644 --- a/src/platform/CYW30739/PlatformManagerImpl.cpp +++ b/src/platform/Infineon/CYW30739/PlatformManagerImpl.cpp @@ -23,7 +23,7 @@ /* this file behaves like a config.h, comes first */ #include -#include +#include #include #include diff --git a/src/platform/CYW30739/PlatformManagerImpl.h b/src/platform/Infineon/CYW30739/PlatformManagerImpl.h similarity index 100% rename from src/platform/CYW30739/PlatformManagerImpl.h rename to src/platform/Infineon/CYW30739/PlatformManagerImpl.h diff --git a/src/platform/CYW30739/SystemPlatformConfig.h b/src/platform/Infineon/CYW30739/SystemPlatformConfig.h similarity index 100% rename from src/platform/CYW30739/SystemPlatformConfig.h rename to src/platform/Infineon/CYW30739/SystemPlatformConfig.h diff --git a/src/platform/CYW30739/SystemTimeSupport.cpp b/src/platform/Infineon/CYW30739/SystemTimeSupport.cpp similarity index 100% rename from src/platform/CYW30739/SystemTimeSupport.cpp rename to src/platform/Infineon/CYW30739/SystemTimeSupport.cpp diff --git a/src/platform/CYW30739/ThreadStackManagerImpl.cpp b/src/platform/Infineon/CYW30739/ThreadStackManagerImpl.cpp similarity index 100% rename from src/platform/CYW30739/ThreadStackManagerImpl.cpp rename to src/platform/Infineon/CYW30739/ThreadStackManagerImpl.cpp diff --git a/src/platform/CYW30739/ThreadStackManagerImpl.h b/src/platform/Infineon/CYW30739/ThreadStackManagerImpl.h similarity index 100% rename from src/platform/CYW30739/ThreadStackManagerImpl.h rename to src/platform/Infineon/CYW30739/ThreadStackManagerImpl.h diff --git a/src/platform/CYW30739/args.gni b/src/platform/Infineon/CYW30739/args.gni similarity index 94% rename from src/platform/CYW30739/args.gni rename to src/platform/Infineon/CYW30739/args.gni index 20266d8f86f825..a0d31c75f4c49b 100644 --- a/src/platform/CYW30739/args.gni +++ b/src/platform/Infineon/CYW30739/args.gni @@ -17,7 +17,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/cyw30739_sdk.gni") import("//build_overrides/pigweed.gni") -import("${chip_root}/examples/platform/cyw30739/args.gni") +import("${chip_root}/examples/platform/infineon/cyw30739/args.gni") custom_toolchain = "${build_root}/toolchain/arm_gcc" @@ -51,7 +51,7 @@ mbedtls_target = "${cyw30739_sdk_build_root}:mbedtls" openthread_external_mbedtls = mbedtls_target openthread_project_core_config_file = "OpenThreadConfig.h" -openthread_core_config_deps = [ "${chip_root}/examples/platform/cyw30739:openthread_core_config_ifx_chip_examples" ] +openthread_core_config_deps = [ "${chip_root}/examples/platform/infineon/cyw30739:openthread_core_config_ifx_chip_examples" ] openthread_external_platform = "${chip_root}/third_party/openthread/platforms/ifx:libopenthread-ifx" diff --git a/src/platform/CYW30739/cycfg_gatt_db.c b/src/platform/Infineon/CYW30739/cycfg_gatt_db.c similarity index 100% rename from src/platform/CYW30739/cycfg_gatt_db.c rename to src/platform/Infineon/CYW30739/cycfg_gatt_db.c diff --git a/src/platform/CYW30739/cycfg_gatt_db.h b/src/platform/Infineon/CYW30739/cycfg_gatt_db.h similarity index 100% rename from src/platform/CYW30739/cycfg_gatt_db.h rename to src/platform/Infineon/CYW30739/cycfg_gatt_db.h diff --git a/src/platform/CYW30739/cyw30739-chip-mbedtls-config.h b/src/platform/Infineon/CYW30739/cyw30739-chip-mbedtls-config.h similarity index 100% rename from src/platform/CYW30739/cyw30739-chip-mbedtls-config.h rename to src/platform/Infineon/CYW30739/cyw30739-chip-mbedtls-config.h diff --git a/src/platform/P6/BLEManagerImpl.cpp b/src/platform/Infineon/PSOC6/BLEManagerImpl.cpp similarity index 100% rename from src/platform/P6/BLEManagerImpl.cpp rename to src/platform/Infineon/PSOC6/BLEManagerImpl.cpp diff --git a/src/platform/P6/BLEManagerImpl.h b/src/platform/Infineon/PSOC6/BLEManagerImpl.h similarity index 100% rename from src/platform/P6/BLEManagerImpl.h rename to src/platform/Infineon/PSOC6/BLEManagerImpl.h diff --git a/src/platform/P6/BUILD.gn b/src/platform/Infineon/PSOC6/BUILD.gn similarity index 93% rename from src/platform/P6/BUILD.gn rename to src/platform/Infineon/PSOC6/BUILD.gn index d7af750cb91df7..d2ed65a9bdf1d4 100644 --- a/src/platform/P6/BUILD.gn +++ b/src/platform/Infineon/PSOC6/BUILD.gn @@ -16,16 +16,16 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") import("${chip_root}/src/platform/device.gni") -assert(chip_device_platform == "p6") +assert(chip_device_platform == "psoc6") if (chip_enable_openthread) { import("//build_overrides/openthread.gni") } -static_library("P6") { +static_library("PSOC6") { sources = [ - "../FreeRTOS/SystemTimeSupport.cpp", - "../SingletonConfigurationManager.cpp", + "../../FreeRTOS/SystemTimeSupport.cpp", + "../../SingletonConfigurationManager.cpp", "BLEManagerImpl.cpp", "BLEManagerImpl.h", "BlePlatformConfig.h", diff --git a/src/platform/P6/BlePlatformConfig.h b/src/platform/Infineon/PSOC6/BlePlatformConfig.h similarity index 100% rename from src/platform/P6/BlePlatformConfig.h rename to src/platform/Infineon/PSOC6/BlePlatformConfig.h diff --git a/src/platform/P6/CHIPDevicePlatformConfig.h b/src/platform/Infineon/PSOC6/CHIPDevicePlatformConfig.h similarity index 100% rename from src/platform/P6/CHIPDevicePlatformConfig.h rename to src/platform/Infineon/PSOC6/CHIPDevicePlatformConfig.h diff --git a/src/platform/P6/CHIPDevicePlatformEvent.h b/src/platform/Infineon/PSOC6/CHIPDevicePlatformEvent.h similarity index 100% rename from src/platform/P6/CHIPDevicePlatformEvent.h rename to src/platform/Infineon/PSOC6/CHIPDevicePlatformEvent.h diff --git a/src/platform/P6/CHIPPlatformConfig.h b/src/platform/Infineon/PSOC6/CHIPPlatformConfig.h similarity index 100% rename from src/platform/P6/CHIPPlatformConfig.h rename to src/platform/Infineon/PSOC6/CHIPPlatformConfig.h diff --git a/src/platform/P6/ConfigurationManagerImpl.cpp b/src/platform/Infineon/PSOC6/ConfigurationManagerImpl.cpp similarity index 99% rename from src/platform/P6/ConfigurationManagerImpl.cpp rename to src/platform/Infineon/PSOC6/ConfigurationManagerImpl.cpp index afa771d5acb837..753b82369512a2 100644 --- a/src/platform/P6/ConfigurationManagerImpl.cpp +++ b/src/platform/Infineon/PSOC6/ConfigurationManagerImpl.cpp @@ -28,8 +28,8 @@ #include #include +#include #include -#include namespace chip { namespace DeviceLayer { diff --git a/src/platform/P6/ConfigurationManagerImpl.h b/src/platform/Infineon/PSOC6/ConfigurationManagerImpl.h similarity index 100% rename from src/platform/P6/ConfigurationManagerImpl.h rename to src/platform/Infineon/PSOC6/ConfigurationManagerImpl.h diff --git a/src/platform/P6/ConnectivityManagerImpl.cpp b/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp similarity index 99% rename from src/platform/P6/ConnectivityManagerImpl.cpp rename to src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp index 0e50d347b3f111..a005d88f01fe5a 100644 --- a/src/platform/P6/ConnectivityManagerImpl.cpp +++ b/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include @@ -45,7 +45,7 @@ #include "lwip/opt.h" #include -#include +#include #include #if !CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION diff --git a/src/platform/P6/ConnectivityManagerImpl.h b/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.h similarity index 100% rename from src/platform/P6/ConnectivityManagerImpl.h rename to src/platform/Infineon/PSOC6/ConnectivityManagerImpl.h diff --git a/src/platform/P6/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.cpp similarity index 97% rename from src/platform/P6/DeviceNetworkProvisioningDelegateImpl.cpp rename to src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.cpp index 08f8593072584d..0379d62a630071 100644 --- a/src/platform/P6/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.cpp @@ -19,7 +19,7 @@ #include #include "DeviceNetworkProvisioningDelegateImpl.h" -#include "platform/P6/P6Utils.h" +#include "platform/Infineon/PSOC6/P6Utils.h" namespace chip { namespace DeviceLayer { diff --git a/src/platform/P6/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.h similarity index 100% rename from src/platform/P6/DeviceNetworkProvisioningDelegateImpl.h rename to src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.h diff --git a/src/platform/P6/DiagnosticDataProviderImpl.cpp b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp similarity index 99% rename from src/platform/P6/DiagnosticDataProviderImpl.cpp rename to src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp index ae3efbcf091e80..16fe1300fdeed3 100644 --- a/src/platform/P6/DiagnosticDataProviderImpl.cpp +++ b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include namespace chip { namespace DeviceLayer { diff --git a/src/platform/P6/DiagnosticDataProviderImpl.h b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.h similarity index 99% rename from src/platform/P6/DiagnosticDataProviderImpl.h rename to src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.h index cba4725b43eaf4..c1c08fac480d37 100644 --- a/src/platform/P6/DiagnosticDataProviderImpl.h +++ b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.h @@ -31,7 +31,7 @@ #include "whd_wlioctl.h" #include #include -#include +#include #define PHYRATE_KPBS_BYTES_PER_SEC 125 diff --git a/src/platform/P6/InetPlatformConfig.h b/src/platform/Infineon/PSOC6/InetPlatformConfig.h similarity index 100% rename from src/platform/P6/InetPlatformConfig.h rename to src/platform/Infineon/PSOC6/InetPlatformConfig.h diff --git a/src/platform/P6/KeyValueStoreManagerImpl.cpp b/src/platform/Infineon/PSOC6/KeyValueStoreManagerImpl.cpp similarity index 100% rename from src/platform/P6/KeyValueStoreManagerImpl.cpp rename to src/platform/Infineon/PSOC6/KeyValueStoreManagerImpl.cpp diff --git a/src/platform/P6/KeyValueStoreManagerImpl.h b/src/platform/Infineon/PSOC6/KeyValueStoreManagerImpl.h similarity index 100% rename from src/platform/P6/KeyValueStoreManagerImpl.h rename to src/platform/Infineon/PSOC6/KeyValueStoreManagerImpl.h diff --git a/src/platform/P6/Logging.cpp b/src/platform/Infineon/PSOC6/Logging.cpp similarity index 100% rename from src/platform/P6/Logging.cpp rename to src/platform/Infineon/PSOC6/Logging.cpp diff --git a/src/platform/P6/LwIPCoreLock.cpp b/src/platform/Infineon/PSOC6/LwIPCoreLock.cpp similarity index 100% rename from src/platform/P6/LwIPCoreLock.cpp rename to src/platform/Infineon/PSOC6/LwIPCoreLock.cpp diff --git a/src/platform/P6/MTBKeyValueStore.cpp b/src/platform/Infineon/PSOC6/MTBKeyValueStore.cpp similarity index 100% rename from src/platform/P6/MTBKeyValueStore.cpp rename to src/platform/Infineon/PSOC6/MTBKeyValueStore.cpp diff --git a/src/platform/P6/MTBKeyValueStore.h b/src/platform/Infineon/PSOC6/MTBKeyValueStore.h similarity index 100% rename from src/platform/P6/MTBKeyValueStore.h rename to src/platform/Infineon/PSOC6/MTBKeyValueStore.h diff --git a/src/platform/P6/NetworkCommissioningDriver.h b/src/platform/Infineon/PSOC6/NetworkCommissioningDriver.h similarity index 100% rename from src/platform/P6/NetworkCommissioningDriver.h rename to src/platform/Infineon/PSOC6/NetworkCommissioningDriver.h diff --git a/src/platform/P6/NetworkCommissioningWiFiDriver.cpp b/src/platform/Infineon/PSOC6/NetworkCommissioningWiFiDriver.cpp similarity index 98% rename from src/platform/P6/NetworkCommissioningWiFiDriver.cpp rename to src/platform/Infineon/PSOC6/NetworkCommissioningWiFiDriver.cpp index 56c98f5d1d6938..7f94651fb9b61e 100644 --- a/src/platform/P6/NetworkCommissioningWiFiDriver.cpp +++ b/src/platform/Infineon/PSOC6/NetworkCommissioningWiFiDriver.cpp @@ -18,9 +18,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/platform/P6/OTAImageProcessorImpl.cpp b/src/platform/Infineon/PSOC6/OTAImageProcessorImpl.cpp similarity index 100% rename from src/platform/P6/OTAImageProcessorImpl.cpp rename to src/platform/Infineon/PSOC6/OTAImageProcessorImpl.cpp diff --git a/src/platform/P6/OTAImageProcessorImpl.h b/src/platform/Infineon/PSOC6/OTAImageProcessorImpl.h similarity index 100% rename from src/platform/P6/OTAImageProcessorImpl.h rename to src/platform/Infineon/PSOC6/OTAImageProcessorImpl.h diff --git a/src/platform/P6/P6Config.cpp b/src/platform/Infineon/PSOC6/P6Config.cpp similarity index 99% rename from src/platform/P6/P6Config.cpp rename to src/platform/Infineon/PSOC6/P6Config.cpp index e15d56c5583b6e..2a4b48df11bf3e 100644 --- a/src/platform/P6/P6Config.cpp +++ b/src/platform/Infineon/PSOC6/P6Config.cpp @@ -27,14 +27,14 @@ #include -#include +#include #include #include #include #include #include -#include +#include namespace chip { namespace DeviceLayer { diff --git a/src/platform/P6/P6Config.h b/src/platform/Infineon/PSOC6/P6Config.h similarity index 100% rename from src/platform/P6/P6Config.h rename to src/platform/Infineon/PSOC6/P6Config.h diff --git a/src/platform/P6/P6Utils.cpp b/src/platform/Infineon/PSOC6/P6Utils.cpp similarity index 99% rename from src/platform/P6/P6Utils.cpp rename to src/platform/Infineon/PSOC6/P6Utils.cpp index 584646c9b4cb2f..ac8744382784f0 100644 --- a/src/platform/P6/P6Utils.cpp +++ b/src/platform/Infineon/PSOC6/P6Utils.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "lwip/icmp.h" #include "lwip/inet.h" @@ -43,7 +43,7 @@ #include "lwip/sys.h" #include "lwip/timeouts.h" #include -#include +#include using namespace ::chip::DeviceLayer::Internal; using chip::DeviceLayer::Internal::DeviceNetworkInfo; diff --git a/src/platform/P6/P6Utils.h b/src/platform/Infineon/PSOC6/P6Utils.h similarity index 100% rename from src/platform/P6/P6Utils.h rename to src/platform/Infineon/PSOC6/P6Utils.h diff --git a/src/platform/P6/PlatformManagerImpl.cpp b/src/platform/Infineon/PSOC6/PlatformManagerImpl.cpp similarity index 97% rename from src/platform/P6/PlatformManagerImpl.cpp rename to src/platform/Infineon/PSOC6/PlatformManagerImpl.cpp index ac22597407dc98..8292e817719288 100644 --- a/src/platform/P6/PlatformManagerImpl.cpp +++ b/src/platform/Infineon/PSOC6/PlatformManagerImpl.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/src/platform/P6/PlatformManagerImpl.h b/src/platform/Infineon/PSOC6/PlatformManagerImpl.h similarity index 100% rename from src/platform/P6/PlatformManagerImpl.h rename to src/platform/Infineon/PSOC6/PlatformManagerImpl.h diff --git a/src/platform/P6/SystemPlatformConfig.h b/src/platform/Infineon/PSOC6/SystemPlatformConfig.h similarity index 100% rename from src/platform/P6/SystemPlatformConfig.h rename to src/platform/Infineon/PSOC6/SystemPlatformConfig.h diff --git a/src/platform/P6/WarmPlatformConfig.h b/src/platform/Infineon/PSOC6/WarmPlatformConfig.h similarity index 100% rename from src/platform/P6/WarmPlatformConfig.h rename to src/platform/Infineon/PSOC6/WarmPlatformConfig.h diff --git a/src/platform/P6/app_platform_cfg.c b/src/platform/Infineon/PSOC6/app_platform_cfg.c similarity index 100% rename from src/platform/P6/app_platform_cfg.c rename to src/platform/Infineon/PSOC6/app_platform_cfg.c diff --git a/src/platform/P6/app_platform_cfg.h b/src/platform/Infineon/PSOC6/app_platform_cfg.h similarity index 100% rename from src/platform/P6/app_platform_cfg.h rename to src/platform/Infineon/PSOC6/app_platform_cfg.h diff --git a/src/platform/P6/args.gni b/src/platform/Infineon/PSOC6/args.gni similarity index 66% rename from src/platform/P6/args.gni rename to src/platform/Infineon/PSOC6/args.gni index b34b5678ae231d..5577e67db7072c 100644 --- a/src/platform/P6/args.gni +++ b/src/platform/Infineon/PSOC6/args.gni @@ -13,17 +13,17 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/p6.gni") +import("//build_overrides/psoc6.gni") -import("${chip_root}/examples/platform/p6/args.gni") +import("${chip_root}/examples/platform/infineon/psoc6/args.gni") -#ARM architecture flags will be set based on p6_family. -arm_platform_config = "${p6_sdk_build_root}/p6_arm.gni" +#ARM architecture flags will be set based on psoc6_family. +arm_platform_config = "${psoc6_sdk_build_root}/psoc6_arm.gni" -mbedtls_target = "${p6_sdk_build_root}:p6_build" +mbedtls_target = "${psoc6_sdk_build_root}:psoc6_build" -chip_device_platform = "p6" +chip_device_platform = "psoc6" -lwip_platform = "p6" +lwip_platform = "psoc6" chip_build_tests = false diff --git a/src/platform/P6/cycfg_bt_settings.cpp b/src/platform/Infineon/PSOC6/cycfg_bt_settings.cpp similarity index 100% rename from src/platform/P6/cycfg_bt_settings.cpp rename to src/platform/Infineon/PSOC6/cycfg_bt_settings.cpp diff --git a/src/platform/P6/cycfg_bt_settings.h b/src/platform/Infineon/PSOC6/cycfg_bt_settings.h similarity index 100% rename from src/platform/P6/cycfg_bt_settings.h rename to src/platform/Infineon/PSOC6/cycfg_bt_settings.h diff --git a/src/platform/P6/cycfg_gap.cpp b/src/platform/Infineon/PSOC6/cycfg_gap.cpp similarity index 100% rename from src/platform/P6/cycfg_gap.cpp rename to src/platform/Infineon/PSOC6/cycfg_gap.cpp diff --git a/src/platform/P6/cycfg_gap.h b/src/platform/Infineon/PSOC6/cycfg_gap.h similarity index 100% rename from src/platform/P6/cycfg_gap.h rename to src/platform/Infineon/PSOC6/cycfg_gap.h diff --git a/src/platform/P6/cycfg_gatt_db.c b/src/platform/Infineon/PSOC6/cycfg_gatt_db.c similarity index 100% rename from src/platform/P6/cycfg_gatt_db.c rename to src/platform/Infineon/PSOC6/cycfg_gatt_db.c diff --git a/src/platform/P6/cycfg_gatt_db.h b/src/platform/Infineon/PSOC6/cycfg_gatt_db.h similarity index 100% rename from src/platform/P6/cycfg_gatt_db.h rename to src/platform/Infineon/PSOC6/cycfg_gatt_db.h diff --git a/src/platform/P6/ethernet.h b/src/platform/Infineon/PSOC6/ethernet.h similarity index 100% rename from src/platform/P6/ethernet.h rename to src/platform/Infineon/PSOC6/ethernet.h diff --git a/src/platform/device.gni b/src/platform/device.gni index 0592a6720e13c0..87330499cbca6e 100755 --- a/src/platform/device.gni +++ b/src/platform/device.gni @@ -82,7 +82,7 @@ declare_args() { # Select DNS-SD implementation if (chip_device_platform == "linux" || chip_device_platform == "esp32" || - chip_device_platform == "mbed" || chip_device_platform == "p6" || + chip_device_platform == "mbed" || chip_device_platform == "psoc6" || chip_device_platform == "ameba" || chip_device_platform == "webos" || chip_device_platform == "cc32xx" || chip_device_platform == "bl602" || chip_device_platform == "mw320" || chip_device_platform == "beken") { @@ -122,8 +122,8 @@ if (chip_device_platform == "cc13x2_26x2") { _chip_device_layer = "telink" } else if (chip_device_platform == "mbed") { _chip_device_layer = "mbed" -} else if (chip_device_platform == "p6") { - _chip_device_layer = "P6" +} else if (chip_device_platform == "psoc6") { + _chip_device_layer = "Infineon/PSOC6" } else if (chip_device_platform == "android") { _chip_device_layer = "android" } else if (chip_device_platform == "ameba") { @@ -131,7 +131,7 @@ if (chip_device_platform == "cc13x2_26x2") { } else if (chip_device_platform == "bl602") { _chip_device_layer = "bouffalolab/BL602" } else if (chip_device_platform == "cyw30739") { - _chip_device_layer = "CYW30739" + _chip_device_layer = "Infineon/CYW30739" } else if (chip_device_platform == "webos") { _chip_device_layer = "webos" } else if (chip_device_platform == "mw320") { @@ -196,7 +196,7 @@ assert( chip_device_platform == "nrfconnect" || chip_device_platform == "k32w0" || chip_device_platform == "qpg" || chip_device_platform == "telink" || chip_device_platform == "mbed" || - chip_device_platform == "p6" || chip_device_platform == "android" || + chip_device_platform == "psoc6" || chip_device_platform == "android" || chip_device_platform == "ameba" || chip_device_platform == "cyw30739" || chip_device_platform == "webos" || chip_device_platform == "bl602" || chip_device_platform == "mw320" || chip_device_platform == "zephyr" || diff --git a/third_party/cyw30739_sdk/BUILD.gn b/third_party/infineon/cyw30739_sdk/BUILD.gn similarity index 94% rename from third_party/cyw30739_sdk/BUILD.gn rename to third_party/infineon/cyw30739_sdk/BUILD.gn index a64a0293f54305..75b9e272840b63 100644 --- a/third_party/cyw30739_sdk/BUILD.gn +++ b/third_party/infineon/cyw30739_sdk/BUILD.gn @@ -32,7 +32,7 @@ group("cyw30739_sdk") { config("mbedtls_cyw30739_config") { defines = [ "MBEDTLS_CONFIG_FILE=", - "MBEDTLS_USER_CONFIG_FILE=", + "MBEDTLS_USER_CONFIG_FILE=", ] include_dirs = [ chip_root ] diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_notices.h b/third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_notices.h similarity index 100% rename from third_party/cyw30739_sdk/bsp_design_modus/cycfg_notices.h rename to third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_notices.h diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.c b/third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_pins.c similarity index 100% rename from third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.c rename to third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_pins.c diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.h b/third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_pins.h similarity index 100% rename from third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.h rename to third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_pins.h diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_routing.h b/third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_routing.h similarity index 100% rename from third_party/cyw30739_sdk/bsp_design_modus/cycfg_routing.h rename to third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_routing.h diff --git a/third_party/cyw30739_sdk/btp_reader.py b/third_party/infineon/cyw30739_sdk/btp_reader.py similarity index 100% rename from third_party/cyw30739_sdk/btp_reader.py rename to third_party/infineon/cyw30739_sdk/btp_reader.py diff --git a/third_party/cyw30739_sdk/compress_cgs_data.py b/third_party/infineon/cyw30739_sdk/compress_cgs_data.py similarity index 100% rename from third_party/cyw30739_sdk/compress_cgs_data.py rename to third_party/infineon/cyw30739_sdk/compress_cgs_data.py diff --git a/third_party/cyw30739_sdk/cyw30739_arm.gni b/third_party/infineon/cyw30739_sdk/cyw30739_arm.gni similarity index 100% rename from third_party/cyw30739_sdk/cyw30739_arm.gni rename to third_party/infineon/cyw30739_sdk/cyw30739_arm.gni diff --git a/third_party/cyw30739_sdk/cyw30739_executable.gni b/third_party/infineon/cyw30739_sdk/cyw30739_executable.gni similarity index 100% rename from third_party/cyw30739_sdk/cyw30739_executable.gni rename to third_party/infineon/cyw30739_sdk/cyw30739_executable.gni diff --git a/third_party/cyw30739_sdk/cyw30739_sdk.gni b/third_party/infineon/cyw30739_sdk/cyw30739_sdk.gni similarity index 100% rename from third_party/cyw30739_sdk/cyw30739_sdk.gni rename to third_party/infineon/cyw30739_sdk/cyw30739_sdk.gni diff --git a/third_party/cyw30739_sdk/flash.btp b/third_party/infineon/cyw30739_sdk/flash.btp similarity index 100% rename from third_party/cyw30739_sdk/flash.btp rename to third_party/infineon/cyw30739_sdk/flash.btp diff --git a/third_party/cyw30739_sdk/gen_ota_image.py b/third_party/infineon/cyw30739_sdk/gen_ota_image.py similarity index 100% rename from third_party/cyw30739_sdk/gen_ota_image.py rename to third_party/infineon/cyw30739_sdk/gen_ota_image.py diff --git a/third_party/cyw30739_sdk/include/auto_flags.h b/third_party/infineon/cyw30739_sdk/include/auto_flags.h similarity index 100% rename from third_party/cyw30739_sdk/include/auto_flags.h rename to third_party/infineon/cyw30739_sdk/include/auto_flags.h diff --git a/third_party/cyw30739_sdk/include/ota_fw_upgrade.h b/third_party/infineon/cyw30739_sdk/include/ota_fw_upgrade.h similarity index 100% rename from third_party/cyw30739_sdk/include/ota_fw_upgrade.h rename to third_party/infineon/cyw30739_sdk/include/ota_fw_upgrade.h diff --git a/third_party/cyw30739_sdk/include/wiced_button_manager.h b/third_party/infineon/cyw30739_sdk/include/wiced_button_manager.h similarity index 100% rename from third_party/cyw30739_sdk/include/wiced_button_manager.h rename to third_party/infineon/cyw30739_sdk/include/wiced_button_manager.h diff --git a/third_party/cyw30739_sdk/include/wiced_led_manager.h b/third_party/infineon/cyw30739_sdk/include/wiced_led_manager.h similarity index 100% rename from third_party/cyw30739_sdk/include/wiced_led_manager.h rename to third_party/infineon/cyw30739_sdk/include/wiced_led_manager.h diff --git a/third_party/cyw30739_sdk/merge_hex.py b/third_party/infineon/cyw30739_sdk/merge_hex.py similarity index 100% rename from third_party/cyw30739_sdk/merge_hex.py rename to third_party/infineon/cyw30739_sdk/merge_hex.py diff --git a/third_party/cyw30739_sdk/repos/30739A0 b/third_party/infineon/cyw30739_sdk/repos/30739A0 similarity index 100% rename from third_party/cyw30739_sdk/repos/30739A0 rename to third_party/infineon/cyw30739_sdk/repos/30739A0 diff --git a/third_party/cyw30739_sdk/repos/CYW930739M2EVB-01 b/third_party/infineon/cyw30739_sdk/repos/CYW930739M2EVB-01 similarity index 100% rename from third_party/cyw30739_sdk/repos/CYW930739M2EVB-01 rename to third_party/infineon/cyw30739_sdk/repos/CYW930739M2EVB-01 diff --git a/third_party/cyw30739_sdk/repos/btsdk-include b/third_party/infineon/cyw30739_sdk/repos/btsdk-include similarity index 100% rename from third_party/cyw30739_sdk/repos/btsdk-include rename to third_party/infineon/cyw30739_sdk/repos/btsdk-include diff --git a/third_party/cyw30739_sdk/repos/btsdk-tools b/third_party/infineon/cyw30739_sdk/repos/btsdk-tools similarity index 100% rename from third_party/cyw30739_sdk/repos/btsdk-tools rename to third_party/infineon/cyw30739_sdk/repos/btsdk-tools diff --git a/third_party/cyw30739_sdk/scripts/wiced-gen-ld.pl b/third_party/infineon/cyw30739_sdk/scripts/wiced-gen-ld.pl similarity index 100% rename from third_party/cyw30739_sdk/scripts/wiced-gen-ld.pl rename to third_party/infineon/cyw30739_sdk/scripts/wiced-gen-ld.pl diff --git a/third_party/cyw30739_sdk/src/ota_fw_upgrade.c b/third_party/infineon/cyw30739_sdk/src/ota_fw_upgrade.c similarity index 100% rename from third_party/cyw30739_sdk/src/ota_fw_upgrade.c rename to third_party/infineon/cyw30739_sdk/src/ota_fw_upgrade.c diff --git a/third_party/cyw30739_sdk/src/platform_retarget_lock.c b/third_party/infineon/cyw30739_sdk/src/platform_retarget_lock.c similarity index 100% rename from third_party/cyw30739_sdk/src/platform_retarget_lock.c rename to third_party/infineon/cyw30739_sdk/src/platform_retarget_lock.c diff --git a/third_party/cyw30739_sdk/src/wiced_button_manager.c b/third_party/infineon/cyw30739_sdk/src/wiced_button_manager.c similarity index 100% rename from third_party/cyw30739_sdk/src/wiced_button_manager.c rename to third_party/infineon/cyw30739_sdk/src/wiced_button_manager.c diff --git a/third_party/cyw30739_sdk/src/wiced_led_manager.c b/third_party/infineon/cyw30739_sdk/src/wiced_led_manager.c similarity index 100% rename from third_party/cyw30739_sdk/src/wiced_led_manager.c rename to third_party/infineon/cyw30739_sdk/src/wiced_led_manager.c diff --git a/third_party/p6/BUILD.gn b/third_party/infineon/psoc6/BUILD.gn similarity index 80% rename from third_party/p6/BUILD.gn rename to third_party/infineon/psoc6/BUILD.gn index cc892053658136..ebb79e618655c3 100644 --- a/third_party/p6/BUILD.gn +++ b/third_party/infineon/psoc6/BUILD.gn @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build_overrides/p6.gni") -import("${p6_sdk_build_root}/p6_sdk.gni") +import("//build_overrides/psoc6.gni") +import("${psoc6_sdk_build_root}/psoc6_sdk.gni") declare_args() { - # Build target to use for p6 SDK. Use this to set global SDK defines. - p6_target_project = "" + # Build target to use for psoc6 SDK. Use this to set global SDK defines. + psoc6_target_project = "" } -assert(p6_target_project != "", "p6_target_project must be specified") +assert(psoc6_target_project != "", "psoc6_target_project must be specified") # Add includes, cflags, asmflags, etc in config -config("p6_sdk_config") { +config("psoc6_sdk_config") { # Pull out includes from generated json # Treat these includes as system includes, so warnings in them are not fatal. _system_include_dirs = [] @@ -32,7 +32,7 @@ config("p6_sdk_config") { include_dir = string_replace(include_dir, "-I", "", 1) # Path is relative to SDK - include_dir = "${p6_sdk_root}/${include_dir}" + include_dir = "${psoc6_sdk_root}/${include_dir}" _system_include_dirs += [ include_dir ] } @@ -43,7 +43,7 @@ config("p6_sdk_config") { } # Also add project include path (passed in from project build) - proj_path = get_label_info(p6_target_project, "dir") + proj_path = get_label_info(psoc6_target_project, "dir") include_dirs = [ "${proj_path}/include" ] # Pull out defines from generated json @@ -57,7 +57,7 @@ config("p6_sdk_config") { libs = [] foreach(lib, mtb_json.libs) { # Path is relative to SDK - lib = "${p6_sdk_root}/${lib}" + lib = "${psoc6_sdk_root}/${lib}" libs += [ lib ] } @@ -76,7 +76,7 @@ config("p6_sdk_config") { linker_script = string_replace(linker_script, "-T", "", 1) # Path is relative to SDK - linker_script = "${p6_sdk_root}/${linker_script}" + linker_script = "${psoc6_sdk_root}/${linker_script}" ldflags += [ "-T" + rebase_path(linker_script, root_build_dir) ] } @@ -89,7 +89,7 @@ config("p6_sdk_config") { ldflags -= [ "--specs=nano.specs" ] } -group("p6_build") { - public_configs = [ ":p6_sdk_config" ] - public_deps = [ p6_target_project ] +group("psoc6_build") { + public_configs = [ ":psoc6_sdk_config" ] + public_deps = [ psoc6_target_project ] } diff --git a/third_party/p6/p6_arm.gni b/third_party/infineon/psoc6/psoc6_arm.gni similarity index 96% rename from third_party/p6/p6_arm.gni rename to third_party/infineon/psoc6/psoc6_arm.gni index 1bd10393e9c60e..031e6e1cd4ce23 100644 --- a/third_party/p6/p6_arm.gni +++ b/third_party/infineon/psoc6/psoc6_arm.gni @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("p6_board.gni") +import("psoc6_board.gni") arm_arch = "armv7e-m" arm_abi = "aapcs" diff --git a/third_party/p6/p6_board.gni b/third_party/infineon/psoc6/psoc6_board.gni similarity index 82% rename from third_party/p6/p6_board.gni rename to third_party/infineon/psoc6/psoc6_board.gni index 01fedc36959abc..a6cae75a7aecc3 100644 --- a/third_party/p6/p6_board.gni +++ b/third_party/infineon/psoc6/psoc6_board.gni @@ -14,13 +14,13 @@ declare_args() { # P6 board used - p6_board = "" + psoc6_board = "" } -if (p6_board == "") { - p6_board = getenv("P6_BOARD") +if (psoc6_board == "") { + psoc6_board = getenv("PSOC6_BOARD") } -assert(p6_board != "", "P6_BOARD must be specified") +assert(psoc6_board != "", "PSOC6_BOARD must be specified") board_defines = [] diff --git a/third_party/p6/p6_executable.gni b/third_party/infineon/psoc6/psoc6_executable.gni similarity index 92% rename from third_party/p6/p6_executable.gni rename to third_party/infineon/psoc6/psoc6_executable.gni index bec0a3e3835a5c..02fd0e6b1593ed 100644 --- a/third_party/p6/p6_executable.gni +++ b/third_party/infineon/psoc6/psoc6_executable.gni @@ -16,9 +16,9 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") import("${build_root}/toolchain/flashable_executable.gni") -import("p6_board.gni") +import("psoc6_board.gni") -template("p6_executable") { +template("psoc6_executable") { output_base_name = get_path_info(invoker.output_name, "name") objcopy_image_name = output_base_name + ".hex" @@ -33,7 +33,7 @@ template("p6_executable") { flashing_runtime_target = target_name + ".flashing_runtime" flashing_script_inputs = [ "${chip_root}/scripts/flashing/firmware_utils.py", - "${chip_root}/scripts/flashing/p6_firmware_utils.py", + "${chip_root}/scripts/flashing/psoc6_firmware_utils.py", ] copy(flashing_runtime_target) { @@ -45,9 +45,9 @@ template("p6_executable") { "${chip_root}/scripts/flashing/gen_flashing_script.py" flashing_script_name = output_base_name + ".flash.py" flashing_options = [ - "p6", + "psoc6", "--device", - "${p6_board}", + "${psoc6_board}", ] flashable_executable(target_name) { diff --git a/third_party/p6/p6_sdk.gni b/third_party/infineon/psoc6/psoc6_sdk.gni similarity index 81% rename from third_party/p6/p6_sdk.gni rename to third_party/infineon/psoc6/psoc6_sdk.gni index fb86bb34937030..90366ddac471aa 100644 --- a/third_party/p6/p6_sdk.gni +++ b/third_party/infineon/psoc6/psoc6_sdk.gni @@ -15,9 +15,9 @@ import("//build_overrides/chip.gni") import("//build_overrides/jlink.gni") import("//build_overrides/mbedtls.gni") -import("//build_overrides/p6.gni") +import("//build_overrides/psoc6.gni") import("${chip_root}/src/platform/device.gni") -import("p6_board.gni") +import("psoc6_board.gni") # TODO: Don't hardcode config/toolchain # TODO: Convert to GN action? @@ -27,17 +27,18 @@ if (is_debug) { debug_str = "Release" } -mtb_json = read_file("${p6_sdk_root}/build/${p6_board}/$debug_str/GCC_ARM.json", - "json") +mtb_json = + read_file("${psoc6_sdk_root}/build/${psoc6_board}/$debug_str/GCC_ARM.json", + "json") -# Defines an p6 SDK build target. +# Defines an psoc6 SDK build target. # # Parameters: # sources - The sources files to build. # -template("p6_sdk_sources") { - if (defined(invoker.p6_project_dir)) { - p6_project_dir = invoker.p6_project_dir +template("psoc6_sdk_sources") { + if (defined(invoker.psoc6_project_dir)) { + psoc6_project_dir = invoker.psoc6_project_dir } if (defined(invoker.chip_enable_ota_requestor)) { @@ -46,7 +47,7 @@ template("p6_sdk_sources") { } } - # While most p6 sdk includes come from the p6_sdk_config config (in + # While most psoc6 sdk includes come from the psoc6_sdk_config config (in # BUILD.gn), this template gets instantiated by each project each of which # provides a few extra includes/defines. Handle those here. config("project_configs") { @@ -54,7 +55,7 @@ template("p6_sdk_sources") { if (defined(invoker.include_dirs)) { include_dirs += invoker.include_dirs } - include_dirs += [ "${p6_project_dir}/include" ] + include_dirs += [ "${psoc6_project_dir}/include" ] defines = [] if (defined(invoker.defines)) { @@ -84,17 +85,17 @@ template("p6_sdk_sources") { # Pull out c sources from generated json foreach(src, mtb_json_local.c_source) { - sources += [ "${p6_sdk_root}/${src}" ] + sources += [ "${psoc6_sdk_root}/${src}" ] } # Pull out cpp sources from generated json foreach(src, mtb_json_local.cxx_source) { - sources += [ "${p6_sdk_root}/${src}" ] + sources += [ "${psoc6_sdk_root}/${src}" ] } # Pull out .S files from generated json foreach(asm, mtb_json_local.asm_source) { - sources += [ "${p6_sdk_root}/${asm}" ] + sources += [ "${psoc6_sdk_root}/${asm}" ] } public_deps = [] diff --git a/third_party/p6/p6_sdk/.gitignore b/third_party/infineon/psoc6/psoc6_sdk/.gitignore similarity index 100% rename from third_party/p6/p6_sdk/.gitignore rename to third_party/infineon/psoc6/psoc6_sdk/.gitignore diff --git a/third_party/p6/p6_sdk/Makefile b/third_party/infineon/psoc6/psoc6_sdk/Makefile similarity index 100% rename from third_party/p6/p6_sdk/Makefile rename to third_party/infineon/psoc6/psoc6_sdk/Makefile diff --git a/third_party/p6/p6_sdk/arch/cc.h b/third_party/infineon/psoc6/psoc6_sdk/arch/cc.h similarity index 100% rename from third_party/p6/p6_sdk/arch/cc.h rename to third_party/infineon/psoc6/psoc6_sdk/arch/cc.h diff --git a/third_party/p6/p6_sdk/arch/sys_arch.c b/third_party/infineon/psoc6/psoc6_sdk/arch/sys_arch.c similarity index 100% rename from third_party/p6/p6_sdk/arch/sys_arch.c rename to third_party/infineon/psoc6/psoc6_sdk/arch/sys_arch.c diff --git a/third_party/p6/p6_sdk/arch/sys_arch.h b/third_party/infineon/psoc6/psoc6_sdk/arch/sys_arch.h similarity index 100% rename from third_party/p6/p6_sdk/arch/sys_arch.h rename to third_party/infineon/psoc6/psoc6_sdk/arch/sys_arch.h diff --git a/third_party/p6/p6_sdk/build/CY8CKIT-062S2-43012/Debug/GCC_ARM.json b/third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Debug/GCC_ARM.json similarity index 100% rename from third_party/p6/p6_sdk/build/CY8CKIT-062S2-43012/Debug/GCC_ARM.json rename to third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Debug/GCC_ARM.json diff --git a/third_party/p6/p6_sdk/build/CY8CKIT-062S2-43012/Release/GCC_ARM.json b/third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Release/GCC_ARM.json similarity index 100% rename from third_party/p6/p6_sdk/build/CY8CKIT-062S2-43012/Release/GCC_ARM.json rename to third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Release/GCC_ARM.json diff --git a/third_party/p6/p6_sdk/configs/FreeRTOSConfig.h b/third_party/infineon/psoc6/psoc6_sdk/configs/FreeRTOSConfig.h similarity index 100% rename from third_party/p6/p6_sdk/configs/FreeRTOSConfig.h rename to third_party/infineon/psoc6/psoc6_sdk/configs/FreeRTOSConfig.h diff --git a/third_party/p6/p6_sdk/configs/iot_config.h b/third_party/infineon/psoc6/psoc6_sdk/configs/iot_config.h similarity index 100% rename from third_party/p6/p6_sdk/configs/iot_config.h rename to third_party/infineon/psoc6/psoc6_sdk/configs/iot_config.h diff --git a/third_party/p6/p6_sdk/configs/lwipopts.h b/third_party/infineon/psoc6/psoc6_sdk/configs/lwipopts.h similarity index 100% rename from third_party/p6/p6_sdk/configs/lwipopts.h rename to third_party/infineon/psoc6/psoc6_sdk/configs/lwipopts.h diff --git a/third_party/p6/p6_sdk/configs/mbedtls_user_config.h b/third_party/infineon/psoc6/psoc6_sdk/configs/mbedtls_user_config.h similarity index 100% rename from third_party/p6/p6_sdk/configs/mbedtls_user_config.h rename to third_party/infineon/psoc6/psoc6_sdk/configs/mbedtls_user_config.h diff --git a/third_party/p6/p6_sdk/configs/mqtt_client_config.h b/third_party/infineon/psoc6/psoc6_sdk/configs/mqtt_client_config.h similarity index 100% rename from third_party/p6/p6_sdk/configs/mqtt_client_config.h rename to third_party/infineon/psoc6/psoc6_sdk/configs/mqtt_client_config.h diff --git a/third_party/p6/p6_sdk/configs/wifi_config.h b/third_party/infineon/psoc6/psoc6_sdk/configs/wifi_config.h similarity index 100% rename from third_party/p6/p6_sdk/configs/wifi_config.h rename to third_party/infineon/psoc6/psoc6_sdk/configs/wifi_config.h diff --git a/third_party/p6/p6_sdk/libs/TARGET_CY8CKIT-062S2-43012 b/third_party/infineon/psoc6/psoc6_sdk/libs/TARGET_CY8CKIT-062S2-43012 similarity index 100% rename from third_party/p6/p6_sdk/libs/TARGET_CY8CKIT-062S2-43012 rename to third_party/infineon/psoc6/psoc6_sdk/libs/TARGET_CY8CKIT-062S2-43012 diff --git a/third_party/p6/p6_sdk/libs/abstraction-rtos b/third_party/infineon/psoc6/psoc6_sdk/libs/abstraction-rtos similarity index 100% rename from third_party/p6/p6_sdk/libs/abstraction-rtos rename to third_party/infineon/psoc6/psoc6_sdk/libs/abstraction-rtos diff --git a/third_party/p6/p6_sdk/libs/anycloud-ota b/third_party/infineon/psoc6/psoc6_sdk/libs/anycloud-ota similarity index 100% rename from third_party/p6/p6_sdk/libs/anycloud-ota rename to third_party/infineon/psoc6/psoc6_sdk/libs/anycloud-ota diff --git a/third_party/p6/p6_sdk/libs/bluetooth-freertos b/third_party/infineon/psoc6/psoc6_sdk/libs/bluetooth-freertos similarity index 100% rename from third_party/p6/p6_sdk/libs/bluetooth-freertos rename to third_party/infineon/psoc6/psoc6_sdk/libs/bluetooth-freertos diff --git a/third_party/p6/p6_sdk/libs/btstack b/third_party/infineon/psoc6/psoc6_sdk/libs/btstack similarity index 100% rename from third_party/p6/p6_sdk/libs/btstack rename to third_party/infineon/psoc6/psoc6_sdk/libs/btstack diff --git a/third_party/p6/p6_sdk/libs/clib-support b/third_party/infineon/psoc6/psoc6_sdk/libs/clib-support similarity index 100% rename from third_party/p6/p6_sdk/libs/clib-support rename to third_party/infineon/psoc6/psoc6_sdk/libs/clib-support diff --git a/third_party/p6/p6_sdk/libs/connectivity-utilities b/third_party/infineon/psoc6/psoc6_sdk/libs/connectivity-utilities similarity index 100% rename from third_party/p6/p6_sdk/libs/connectivity-utilities rename to third_party/infineon/psoc6/psoc6_sdk/libs/connectivity-utilities diff --git a/third_party/p6/p6_sdk/libs/core-lib b/third_party/infineon/psoc6/psoc6_sdk/libs/core-lib similarity index 100% rename from third_party/p6/p6_sdk/libs/core-lib rename to third_party/infineon/psoc6/psoc6_sdk/libs/core-lib diff --git a/third_party/p6/p6_sdk/libs/core-make b/third_party/infineon/psoc6/psoc6_sdk/libs/core-make similarity index 100% rename from third_party/p6/p6_sdk/libs/core-make rename to third_party/infineon/psoc6/psoc6_sdk/libs/core-make diff --git a/third_party/p6/p6_sdk/libs/freertos b/third_party/infineon/psoc6/psoc6_sdk/libs/freertos similarity index 100% rename from third_party/p6/p6_sdk/libs/freertos rename to third_party/infineon/psoc6/psoc6_sdk/libs/freertos diff --git a/third_party/p6/p6_sdk/libs/kv-store b/third_party/infineon/psoc6/psoc6_sdk/libs/kv-store similarity index 100% rename from third_party/p6/p6_sdk/libs/kv-store rename to third_party/infineon/psoc6/psoc6_sdk/libs/kv-store diff --git a/third_party/p6/p6_sdk/libs/lwip b/third_party/infineon/psoc6/psoc6_sdk/libs/lwip similarity index 100% rename from third_party/p6/p6_sdk/libs/lwip rename to third_party/infineon/psoc6/psoc6_sdk/libs/lwip diff --git a/third_party/p6/p6_sdk/libs/mbedtls b/third_party/infineon/psoc6/psoc6_sdk/libs/mbedtls similarity index 100% rename from third_party/p6/p6_sdk/libs/mbedtls rename to third_party/infineon/psoc6/psoc6_sdk/libs/mbedtls diff --git a/third_party/p6/p6_sdk/libs/mtb-hal-cat1 b/third_party/infineon/psoc6/psoc6_sdk/libs/mtb-hal-cat1 similarity index 100% rename from third_party/p6/p6_sdk/libs/mtb-hal-cat1 rename to third_party/infineon/psoc6/psoc6_sdk/libs/mtb-hal-cat1 diff --git a/third_party/p6/p6_sdk/libs/mtb-pdl-cat1 b/third_party/infineon/psoc6/psoc6_sdk/libs/mtb-pdl-cat1 similarity index 100% rename from third_party/p6/p6_sdk/libs/mtb-pdl-cat1 rename to third_party/infineon/psoc6/psoc6_sdk/libs/mtb-pdl-cat1 diff --git a/third_party/p6/p6_sdk/libs/psoc6cm0p b/third_party/infineon/psoc6/psoc6_sdk/libs/psoc6cm0p similarity index 100% rename from third_party/p6/p6_sdk/libs/psoc6cm0p rename to third_party/infineon/psoc6/psoc6_sdk/libs/psoc6cm0p diff --git a/third_party/p6/p6_sdk/libs/recipe-make-cat1a b/third_party/infineon/psoc6/psoc6_sdk/libs/recipe-make-cat1a similarity index 100% rename from third_party/p6/p6_sdk/libs/recipe-make-cat1a rename to third_party/infineon/psoc6/psoc6_sdk/libs/recipe-make-cat1a diff --git a/third_party/p6/p6_sdk/libs/retarget-io b/third_party/infineon/psoc6/psoc6_sdk/libs/retarget-io similarity index 100% rename from third_party/p6/p6_sdk/libs/retarget-io rename to third_party/infineon/psoc6/psoc6_sdk/libs/retarget-io diff --git a/third_party/p6/p6_sdk/libs/secure-sockets b/third_party/infineon/psoc6/psoc6_sdk/libs/secure-sockets similarity index 100% rename from third_party/p6/p6_sdk/libs/secure-sockets rename to third_party/infineon/psoc6/psoc6_sdk/libs/secure-sockets diff --git a/third_party/p6/p6_sdk/libs/serial-flash b/third_party/infineon/psoc6/psoc6_sdk/libs/serial-flash similarity index 100% rename from third_party/p6/p6_sdk/libs/serial-flash rename to third_party/infineon/psoc6/psoc6_sdk/libs/serial-flash diff --git a/third_party/p6/p6_sdk/libs/whd-bsp-integration b/third_party/infineon/psoc6/psoc6_sdk/libs/whd-bsp-integration similarity index 100% rename from third_party/p6/p6_sdk/libs/whd-bsp-integration rename to third_party/infineon/psoc6/psoc6_sdk/libs/whd-bsp-integration diff --git a/third_party/p6/p6_sdk/libs/wifi-connection-manager b/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-connection-manager similarity index 100% rename from third_party/p6/p6_sdk/libs/wifi-connection-manager rename to third_party/infineon/psoc6/psoc6_sdk/libs/wifi-connection-manager diff --git a/third_party/p6/p6_sdk/libs/wifi-host-driver b/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-host-driver similarity index 100% rename from third_party/p6/p6_sdk/libs/wifi-host-driver rename to third_party/infineon/psoc6/psoc6_sdk/libs/wifi-host-driver diff --git a/third_party/p6/p6_sdk/libs/wifi-mw-core b/third_party/infineon/psoc6/psoc6_sdk/libs/wifi-mw-core similarity index 100% rename from third_party/p6/p6_sdk/libs/wifi-mw-core rename to third_party/infineon/psoc6/psoc6_sdk/libs/wifi-mw-core diff --git a/third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_assert.h b/third_party/infineon/psoc6/psoc6_sdk/ota/config/mcuboot_config/mcuboot_assert.h similarity index 100% rename from third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_assert.h rename to third_party/infineon/psoc6/psoc6_sdk/ota/config/mcuboot_config/mcuboot_assert.h diff --git a/third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_config.h b/third_party/infineon/psoc6/psoc6_sdk/ota/config/mcuboot_config/mcuboot_config.h similarity index 100% rename from third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_config.h rename to third_party/infineon/psoc6/psoc6_sdk/ota/config/mcuboot_config/mcuboot_config.h diff --git a/third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_logging.h b/third_party/infineon/psoc6/psoc6_sdk/ota/config/mcuboot_config/mcuboot_logging.h similarity index 100% rename from third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_logging.h rename to third_party/infineon/psoc6/psoc6_sdk/ota/config/mcuboot_config/mcuboot_logging.h diff --git a/third_party/p6/p6_sdk/ota/config/mcuboot_crypto_acc_config.h b/third_party/infineon/psoc6/psoc6_sdk/ota/config/mcuboot_crypto_acc_config.h similarity index 100% rename from third_party/p6/p6_sdk/ota/config/mcuboot_crypto_acc_config.h rename to third_party/infineon/psoc6/psoc6_sdk/ota/config/mcuboot_crypto_acc_config.h diff --git a/third_party/p6/p6_sdk/ota/config/mcuboot_crypto_config.h b/third_party/infineon/psoc6/psoc6_sdk/ota/config/mcuboot_crypto_config.h similarity index 100% rename from third_party/p6/p6_sdk/ota/config/mcuboot_crypto_config.h rename to third_party/infineon/psoc6/psoc6_sdk/ota/config/mcuboot_crypto_config.h diff --git a/third_party/p6/p6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld b/third_party/infineon/psoc6/psoc6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld similarity index 100% rename from third_party/p6/p6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld rename to third_party/infineon/psoc6/psoc6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld diff --git a/third_party/p6/p6_sdk/ota/matter-psoc6-mcuboot-bootloader.hex b/third_party/infineon/psoc6/psoc6_sdk/ota/matter-psoc6-mcuboot-bootloader.hex similarity index 100% rename from third_party/p6/p6_sdk/ota/matter-psoc6-mcuboot-bootloader.hex rename to third_party/infineon/psoc6/psoc6_sdk/ota/matter-psoc6-mcuboot-bootloader.hex diff --git a/third_party/p6/p6_sdk/ota/ota_base_build.sh b/third_party/infineon/psoc6/psoc6_sdk/ota/ota_base_build.sh similarity index 100% rename from third_party/p6/p6_sdk/ota/ota_base_build.sh rename to third_party/infineon/psoc6/psoc6_sdk/ota/ota_base_build.sh diff --git a/third_party/p6/p6_sdk/ota/ota_update_build.sh b/third_party/infineon/psoc6/psoc6_sdk/ota/ota_update_build.sh similarity index 100% rename from third_party/p6/p6_sdk/ota/ota_update_build.sh rename to third_party/infineon/psoc6/psoc6_sdk/ota/ota_update_build.sh