diff --git a/boards/arm64/phycore_am62x_a53/Kconfig.board b/boards/arm64/phycore_am62x_a53/Kconfig.board deleted file mode 100644 index 1a8e9d08363..00000000000 --- a/boards/arm64/phycore_am62x_a53/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2023 Enphase Energy -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PHYCORE_AM62X_A53 - bool "PHYTEC phyCORE-AM62x A53" - depends on SOC_SERIES_AM6X_A53 diff --git a/boards/arm64/phycore_am62x_a53/Kconfig.defconfig b/boards/arm64/phycore_am62x_a53/Kconfig.defconfig deleted file mode 100644 index 51dd70ebc3c..00000000000 --- a/boards/arm64/phycore_am62x_a53/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2023 Enphase Energy -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_PHYCORE_AM62X_A53 - -config BOARD - default "phycore_am62x_a53" - -endif # BOARD_PHYCORE_AM62X_A53 diff --git a/boards/v2/phytec/phycore_am62x/Kconfig.phycore_am62x b/boards/v2/phytec/phycore_am62x/Kconfig.phycore_am62x new file mode 100644 index 00000000000..8c66cb29198 --- /dev/null +++ b/boards/v2/phytec/phycore_am62x/Kconfig.phycore_am62x @@ -0,0 +1,5 @@ +# Copyright (c) 2023 Enphase Energy +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PHYCORE_AM62X + select SOC_AM6234_A53 if BOARD_PHYCORE_AM62X_AM6234_A53 diff --git a/boards/v2/phytec/phycore_am62x/board.yml b/boards/v2/phytec/phycore_am62x/board.yml new file mode 100644 index 00000000000..7429a45b83f --- /dev/null +++ b/boards/v2/phytec/phycore_am62x/board.yml @@ -0,0 +1,5 @@ +board: + name: phycore_am62x + vendor: Phytec + socs: + - name: am6234 diff --git a/boards/arm64/phycore_am62x_a53/doc/index.rst b/boards/v2/phytec/phycore_am62x/doc/index.rst similarity index 98% rename from boards/arm64/phycore_am62x_a53/doc/index.rst rename to boards/v2/phytec/phycore_am62x/doc/index.rst index 0fb1c6063b1..fd711350fe3 100644 --- a/boards/arm64/phycore_am62x_a53/doc/index.rst +++ b/boards/v2/phytec/phycore_am62x/doc/index.rst @@ -78,7 +78,7 @@ You can build an application in the usual way. Refer to :ref:`hello_world`. .. zephyr-app-commands:: - :board: phycore_am62x_a53 + :board: phycore_am62x/am6234/a53 :zephyr-app: samples/hello_world :goals: build diff --git a/boards/arm64/phycore_am62x_a53/phycore_am62x_a53.dts b/boards/v2/phytec/phycore_am62x/phycore_am62x_am6234_a53.dts similarity index 100% rename from boards/arm64/phycore_am62x_a53/phycore_am62x_a53.dts rename to boards/v2/phytec/phycore_am62x/phycore_am62x_am6234_a53.dts diff --git a/boards/arm64/phycore_am62x_a53/phycore_am62x_a53.yaml b/boards/v2/phytec/phycore_am62x/phycore_am62x_am6234_a53.yaml similarity index 81% rename from boards/arm64/phycore_am62x_a53/phycore_am62x_a53.yaml rename to boards/v2/phytec/phycore_am62x/phycore_am62x_am6234_a53.yaml index fe65e6b4a36..b12e8863b50 100644 --- a/boards/arm64/phycore_am62x_a53/phycore_am62x_a53.yaml +++ b/boards/v2/phytec/phycore_am62x/phycore_am62x_am6234_a53.yaml @@ -1,4 +1,4 @@ -identifier: phycore_am62x_a53 +identifier: phycore_am62x/am6234/a53 name: PHYTEC phyCORE-AM62x A53 type: mcu arch: arm64 diff --git a/boards/arm64/phycore_am62x_a53/phycore_am62x_a53_defconfig b/boards/v2/phytec/phycore_am62x/phycore_am62x_am6234_a53_defconfig similarity index 84% rename from boards/arm64/phycore_am62x_a53/phycore_am62x_a53_defconfig rename to boards/v2/phytec/phycore_am62x/phycore_am62x_am6234_a53_defconfig index 3f5893f6747..527a3fc2347 100644 --- a/boards/arm64/phycore_am62x_a53/phycore_am62x_a53_defconfig +++ b/boards/v2/phytec/phycore_am62x/phycore_am62x_am6234_a53_defconfig @@ -12,9 +12,6 @@ CONFIG_DCACHE_LINE_SIZE_DETECT=y CONFIG_ICACHE_LINE_SIZE_DETECT=y # Platform Configuration -CONFIG_SOC_SERIES_AM6X_A53=y -CONFIG_SOC_AM6234_A53=y -CONFIG_BOARD_PHYCORE_AM62X_A53=y # Zephyr Kernel Configuration CONFIG_XIP=n