From 53d41869d169a81ccf8818aadc736360e15d1547 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 6 Feb 2024 10:37:37 +0000 Subject: [PATCH] boards: arm: cy8cproto_062_4343w: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../Kconfig.cy8cproto_062_4343w} | 2 +- .../cy8cproto_062_4343w/Kconfig.defconfig | 3 --- .../arm => cypress}/cy8cproto_062_4343w/board.cmake | 0 boards/cypress/cy8cproto_062_4343w/board.yml | 5 +++++ .../cy8cproto_062_4343w-common.dtsi | 0 .../cy8cproto_062_4343w-pinctrl.dtsi | 0 .../cy8cproto_062_4343w/cy8cproto_062_4343w.dts | 0 .../cy8cproto_062_4343w/cy8cproto_062_4343w.yaml | 0 .../cy8cproto_062_4343w_defconfig | 4 ---- .../cy8cproto_062_4343w/doc/img/board.jpg | Bin .../cy8cproto_062_4343w/doc/index.rst | 4 ++-- .../cy8cproto_062_4343w/support/openocd.cfg | 0 12 files changed, 8 insertions(+), 10 deletions(-) rename boards/{boards_legacy/arm/cy8cproto_062_4343w/Kconfig.board => cypress/cy8cproto_062_4343w/Kconfig.cy8cproto_062_4343w} (74%) rename boards/{boards_legacy/arm => cypress}/cy8cproto_062_4343w/Kconfig.defconfig (94%) rename boards/{boards_legacy/arm => cypress}/cy8cproto_062_4343w/board.cmake (100%) create mode 100644 boards/cypress/cy8cproto_062_4343w/board.yml rename boards/{boards_legacy/arm => cypress}/cy8cproto_062_4343w/cy8cproto_062_4343w-common.dtsi (100%) rename boards/{boards_legacy/arm => cypress}/cy8cproto_062_4343w/cy8cproto_062_4343w-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => cypress}/cy8cproto_062_4343w/cy8cproto_062_4343w.dts (100%) rename boards/{boards_legacy/arm => cypress}/cy8cproto_062_4343w/cy8cproto_062_4343w.yaml (100%) rename boards/{boards_legacy/arm => cypress}/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig (84%) rename boards/{boards_legacy/arm => cypress}/cy8cproto_062_4343w/doc/img/board.jpg (100%) rename boards/{boards_legacy/arm => cypress}/cy8cproto_062_4343w/doc/index.rst (97%) rename boards/{boards_legacy/arm => cypress}/cy8cproto_062_4343w/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/Kconfig.board b/boards/cypress/cy8cproto_062_4343w/Kconfig.cy8cproto_062_4343w similarity index 74% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/Kconfig.board rename to boards/cypress/cy8cproto_062_4343w/Kconfig.cy8cproto_062_4343w index ab708cfb438..6af485a6bed 100644 --- a/boards/boards_legacy/arm/cy8cproto_062_4343w/Kconfig.board +++ b/boards/cypress/cy8cproto_062_4343w/Kconfig.cy8cproto_062_4343w @@ -4,4 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_CY8CPROTO_062_4343W - bool "CY8CPROTO-062-4343W PSoC™ 6 Wi-Fi BT Prototyping Kit" + select SOC_CY8C624ABZI_S2D44 diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/Kconfig.defconfig b/boards/cypress/cy8cproto_062_4343w/Kconfig.defconfig similarity index 94% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/Kconfig.defconfig rename to boards/cypress/cy8cproto_062_4343w/Kconfig.defconfig index 0ed2d372835..270370c7660 100644 --- a/boards/boards_legacy/arm/cy8cproto_062_4343w/Kconfig.defconfig +++ b/boards/cypress/cy8cproto_062_4343w/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_CY8CPROTO_062_4343W -config BOARD - default "cy8cproto_062_4343w" - if WIFI || BT # Select AIROC part and module diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/board.cmake b/boards/cypress/cy8cproto_062_4343w/board.cmake similarity index 100% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/board.cmake rename to boards/cypress/cy8cproto_062_4343w/board.cmake diff --git a/boards/cypress/cy8cproto_062_4343w/board.yml b/boards/cypress/cy8cproto_062_4343w/board.yml new file mode 100644 index 00000000000..fad3db8df20 --- /dev/null +++ b/boards/cypress/cy8cproto_062_4343w/board.yml @@ -0,0 +1,5 @@ +board: + name: cy8cproto_062_4343w + vendor: Cypress + socs: + - name: cy8c624abzi_s2d44 diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w-common.dtsi b/boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w-common.dtsi similarity index 100% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w-common.dtsi rename to boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w-common.dtsi diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w-pinctrl.dtsi b/boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w-pinctrl.dtsi rename to boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w.dts b/boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w.dts similarity index 100% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w.dts rename to boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w.dts diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w.yaml b/boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w.yaml similarity index 100% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w.yaml rename to boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w.yaml diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig b/boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig similarity index 84% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig rename to boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig index 3dd8e0eac78..19975610f60 100644 --- a/boards/boards_legacy/arm/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig +++ b/boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig @@ -3,10 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -# Choice PSoC 6 Series and MPN -CONFIG_SOC_SERIES_PSOC_62=y -CONFIG_SOC_CY8C624ABZI_S2D44=y - # General configuration CONFIG_CORTEX_M_SYSTICK=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/doc/img/board.jpg b/boards/cypress/cy8cproto_062_4343w/doc/img/board.jpg similarity index 100% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/doc/img/board.jpg rename to boards/cypress/cy8cproto_062_4343w/doc/img/board.jpg diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/doc/index.rst b/boards/cypress/cy8cproto_062_4343w/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/doc/index.rst rename to boards/cypress/cy8cproto_062_4343w/doc/index.rst index 9cf9c942591..e1be366086c 100644 --- a/boards/boards_legacy/arm/cy8cproto_062_4343w/doc/index.rst +++ b/boards/cypress/cy8cproto_062_4343w/doc/index.rst @@ -74,7 +74,7 @@ The board configuration supports the following hardware features: The default configuration can be found in the Kconfig -:zephyr_file:`boards/arm/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig` +:zephyr_file:`boards/cypress/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig` System Clock @@ -88,7 +88,7 @@ system clock are provided in the SOC, depending on your system requirements. Fetch Binary Blobs ****************** -cy8cproto_062_4343w board requires fetch binary files +cy8cproto_062_4343w board optionally uses binary blobs for features (e.g WIFI/Bluetooth chip firmware, CM0p prebuilt images, etc). To fetch Binary Blobs: diff --git a/boards/boards_legacy/arm/cy8cproto_062_4343w/support/openocd.cfg b/boards/cypress/cy8cproto_062_4343w/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/cy8cproto_062_4343w/support/openocd.cfg rename to boards/cypress/cy8cproto_062_4343w/support/openocd.cfg