diff --git a/boards/arm/am62x_m4/Kconfig.board b/boards/arm/am62x_m4/Kconfig.board deleted file mode 100644 index 963b5c6133d..00000000000 --- a/boards/arm/am62x_m4/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Texas Instruments Sitara AM62x-SK-M4 EVM -# -# Copyright (c) 2023 Texas Instruments Incorporated -# Copyright (c) 2023 L Lakshmanan -# -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_AM62X_M4_SK - bool "TI AM62x M4 Starter Kit (SK) Evaluation Module (EVM)" - depends on SOC_SERIES_AM62X_M4 - -config BOARD_AM62X_M4_PHYBOARD_LYRA - bool "PHYTEC AM62x M4 phyBOARD-Lyra" - depends on SOC_SERIES_AM62X_M4 diff --git a/boards/arm/am62x_m4/Kconfig.defconfig b/boards/arm/am62x_m4/Kconfig.defconfig deleted file mode 100644 index 7b6182aa040..00000000000 --- a/boards/arm/am62x_m4/Kconfig.defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Texas Instruments Sitara AM62x-SK-M4 EVM -# -# Copyright (c) 2023 Texas Instruments Incorporated -# Copyright (c) 2023 L Lakshmanan -# -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_AM62X_M4_SK - -config BOARD - default "am62x_m4_sk" - -endif # BOARD_AM62X_M4_SK - -if BOARD_AM62X_M4_PHYBOARD_LYRA - -config BOARD - default "am62x_m4_phyboard_lyra" - -endif # BOARD_AM62X_M4_PHYBOARD_LYRA diff --git a/boards/arm/am62x_m4/doc/index.rst b/boards/arm/am62x_m4/doc/index.rst deleted file mode 100644 index c542113e962..00000000000 --- a/boards/arm/am62x_m4/doc/index.rst +++ /dev/null @@ -1,38 +0,0 @@ -.. _am62x_m4: - -AM62x M4F Core -############## - -Overview -******** - -The Texas Instrument AM62x SoC contains a quad Cortex-A53 cluster and a single -Cortex-M4F core in the MCU domain. This chapter describes all boards with support -for the M4F subsystem. - -Currently the following hardware platforms are supported: - -.. toctree:: - :maxdepth: 1 - - am62x_m4_sk.rst - am62x_m4_phyboard_lyra.rst - -Supported Features -================== - -The AM62x M4F platform supports the following hardware features: - -+-----------+------------+-------------------------------------+ -| Interface | Controller | Driver/Component | -+===========+============+=====================================+ -| NVIC | on-chip | nested vector interrupt controller | -+-----------+------------+-------------------------------------+ -| SYSTICK | on-chip | systick | -+-----------+------------+-------------------------------------+ -| PINCTRL | on-chip | pinctrl | -+-----------+------------+-------------------------------------+ -| UART | on-chip | serial | -+-----------+------------+-------------------------------------+ - -Other hardware features are not currently supported by the port. diff --git a/boards/v2/phytec/phyboard_lyra_am62x/Kconfig.phyboard_lyra_am62x b/boards/v2/phytec/phyboard_lyra_am62x/Kconfig.phyboard_lyra_am62x new file mode 100644 index 00000000000..1b9c5eb8161 --- /dev/null +++ b/boards/v2/phytec/phyboard_lyra_am62x/Kconfig.phyboard_lyra_am62x @@ -0,0 +1,11 @@ +# Texas Instruments Sitara AM62x-SK-M4 EVM +# +# Copyright (c) 2023 Texas Instruments Incorporated +# Copyright (c) 2023 L Lakshmanan +# +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PHYBOARD_LYRA_AM62X + select SOC_AM6234_M4 if BOARD_PHYBOARD_LYRA_AM62X_AM6234_M4 + help + PHYTEC AM62x M4 phyBOARD-Lyra diff --git a/boards/v2/phytec/phyboard_lyra_am62x/board.yml b/boards/v2/phytec/phyboard_lyra_am62x/board.yml new file mode 100644 index 00000000000..fbb9b9ac7e2 --- /dev/null +++ b/boards/v2/phytec/phyboard_lyra_am62x/board.yml @@ -0,0 +1,5 @@ +board: + name: phyboard_lyra_am62x + vendor: Phytec + socs: + - name: am6234 diff --git a/boards/arm/am62x_m4/doc/img/phyCORE-AM62x_Lyra_frontside.webp b/boards/v2/phytec/phyboard_lyra_am62x/doc/img/phyCORE-AM62x_Lyra_frontside.webp similarity index 100% rename from boards/arm/am62x_m4/doc/img/phyCORE-AM62x_Lyra_frontside.webp rename to boards/v2/phytec/phyboard_lyra_am62x/doc/img/phyCORE-AM62x_Lyra_frontside.webp diff --git a/boards/arm/am62x_m4/doc/am62x_m4_phyboard_lyra.rst b/boards/v2/phytec/phyboard_lyra_am62x/doc/index.rst similarity index 98% rename from boards/arm/am62x_m4/doc/am62x_m4_phyboard_lyra.rst rename to boards/v2/phytec/phyboard_lyra_am62x/doc/index.rst index 189710b5e48..81694d98314 100644 --- a/boards/arm/am62x_m4/doc/am62x_m4_phyboard_lyra.rst +++ b/boards/v2/phytec/phyboard_lyra_am62x/doc/index.rst @@ -104,7 +104,7 @@ To test the M4F core, we build the `hello_world` sample with the following comma .. code-block:: console # From the root of the Zephyr repository - west build -p -b am62x_m4_phyboard_lyra samples/hello_world + west build -p -b phyboard_lyra_am62x/am6234/m4 samples/hello_world This builds the program and the binary is present in the `build/zephyr` directory as `zephyr.elf`. diff --git a/boards/arm/am62x_m4/am62x_m4_phyboard_lyra.dts b/boards/v2/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.dts similarity index 100% rename from boards/arm/am62x_m4/am62x_m4_phyboard_lyra.dts rename to boards/v2/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.dts diff --git a/boards/arm/am62x_m4/am62x_m4_phyboard_lyra.yaml b/boards/v2/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.yaml similarity index 70% rename from boards/arm/am62x_m4/am62x_m4_phyboard_lyra.yaml rename to boards/v2/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.yaml index b77fb449347..df0e8ec65bd 100644 --- a/boards/arm/am62x_m4/am62x_m4_phyboard_lyra.yaml +++ b/boards/v2/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.yaml @@ -1,4 +1,4 @@ -identifier: am62x_m4_phyboard_lyra +identifier: phyboard_lyra_am62x/am6234/m4 name: PHYTEC AM62x M4 phyBOARD-Lyra type: mcu arch: arm diff --git a/boards/arm/am62x_m4/am62x_m4_phyboard_lyra_defconfig b/boards/v2/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4_defconfig similarity index 82% rename from boards/arm/am62x_m4/am62x_m4_phyboard_lyra_defconfig rename to boards/v2/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4_defconfig index 822222a8900..7e20705fa3f 100644 --- a/boards/arm/am62x_m4/am62x_m4_phyboard_lyra_defconfig +++ b/boards/v2/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4_defconfig @@ -6,9 +6,6 @@ # SPDX-License-Identifier: Apache-2.0 # Platform Configuration -CONFIG_SOC_SERIES_AM62X_M4=y -CONFIG_SOC_AM62x_M4=y -CONFIG_BOARD_AM62X_M4_PHYBOARD_LYRA=y CONFIG_CORTEX_M_SYSTICK=y # Zephyr Kernel Configuration diff --git a/boards/v2/ti/sk_am62/Kconfig.sk_am62 b/boards/v2/ti/sk_am62/Kconfig.sk_am62 new file mode 100644 index 00000000000..d7e83cba87a --- /dev/null +++ b/boards/v2/ti/sk_am62/Kconfig.sk_am62 @@ -0,0 +1,11 @@ +# Texas Instruments Sitara AM62x-SK-M4 EVM +# +# Copyright (c) 2023 Texas Instruments Incorporated +# Copyright (c) 2023 L Lakshmanan +# +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SK_AM62_AM6234_M4 + select SOC_AM6234_M4 + help + TI AM62x M4 Starter Kit (SK) Evaluation Module (EVM) diff --git a/boards/v2/ti/sk_am62/board.yml b/boards/v2/ti/sk_am62/board.yml new file mode 100644 index 00000000000..644da49af46 --- /dev/null +++ b/boards/v2/ti/sk_am62/board.yml @@ -0,0 +1,5 @@ +board: + name: sk_am62 + vendor: Texas Instruments + socs: + - name: am6234 diff --git a/boards/arm/am62x_m4/doc/img/sk_am62_angled.webp b/boards/v2/ti/sk_am62/doc/img/sk_am62_angled.webp similarity index 100% rename from boards/arm/am62x_m4/doc/img/sk_am62_angled.webp rename to boards/v2/ti/sk_am62/doc/img/sk_am62_angled.webp diff --git a/boards/arm/am62x_m4/doc/am62x_m4_sk.rst b/boards/v2/ti/sk_am62/doc/index.rst similarity index 91% rename from boards/arm/am62x_m4/doc/am62x_m4_sk.rst rename to boards/v2/ti/sk_am62/doc/index.rst index e789c33d5f8..f6c2af3ae53 100644 --- a/boards/arm/am62x_m4/doc/am62x_m4_sk.rst +++ b/boards/v2/ti/sk_am62/doc/index.rst @@ -1,12 +1,12 @@ -.. _am62x_m4_sk: +.. _sk_am62: -AM62x-SK M4F Core -################# +SK-AM62 M4F Core +################ Overview ******** -The AM62x-SK board configuration is used by Zephyr applications that run on +The SK-AM62 board configuration is used by Zephyr applications that run on the TI AM62x platform. The board configuration provides support for the ARM Cortex-M4F MCU core and the following features: @@ -19,13 +19,13 @@ See the `TI AM62X Product Page`_ for details. .. figure:: img/sk_am62_angled.webp :align: center - :alt: TI AM62x-SK EVM + :alt: TI SK-AM62 EVM - Texas Instruments AM62x SK EVM + Texas Instruments SK-AM62 EVM Hardware ******** -The AM62x-SK EVM features the AM62x SoC, which is composed of a quad Cortex-A53 +The SK-AM62 EVM features the AM62x SoC, which is composed of a quad Cortex-A53 cluster and a single Cortex-M4 core in the MCU domain. Zephyr is ported to run on the M4F core and the following listed hardware specifications are used: @@ -42,7 +42,7 @@ the M4F core and the following listed hardware specifications are used: Supported Features ================== -The am62x_m4_sk configuration supports the following hardware features: +The sk_am62 configuration supports the following hardware features: +-----------+------------+-------------------------------------+ | Interface | Controller | Driver/Component | @@ -102,7 +102,7 @@ To test the M4F core, we build the `hello_world` sample with the following comma .. code-block:: console # From the root of the Zephyr repository - west build -p -b am62x_m4_sk samples/hello_world + west build -p -b sk_am62/am6234/m4 samples/hello_world This builds the program and the binary is present in the `build/zephyr` directory as `zephyr.elf`. diff --git a/boards/arm/am62x_m4/am62x_m4_sk.dts b/boards/v2/ti/sk_am62/sk_am62_am6234_m4.dts similarity index 100% rename from boards/arm/am62x_m4/am62x_m4_sk.dts rename to boards/v2/ti/sk_am62/sk_am62_am6234_m4.dts diff --git a/boards/arm/am62x_m4/am62x_m4_sk.yaml b/boards/v2/ti/sk_am62/sk_am62_am6234_m4.yaml similarity index 76% rename from boards/arm/am62x_m4/am62x_m4_sk.yaml rename to boards/v2/ti/sk_am62/sk_am62_am6234_m4.yaml index ef07d5a99d9..d257c6dc98d 100644 --- a/boards/arm/am62x_m4/am62x_m4_sk.yaml +++ b/boards/v2/ti/sk_am62/sk_am62_am6234_m4.yaml @@ -1,4 +1,4 @@ -identifier: am62x_m4_sk +identifier: sk_am62/am6234/m4 name: TI AM62X M4 Starter Kit (SK) type: mcu arch: arm diff --git a/boards/arm/am62x_m4/am62x_m4_sk_defconfig b/boards/v2/ti/sk_am62/sk_am62_am6234_m4_defconfig similarity index 83% rename from boards/arm/am62x_m4/am62x_m4_sk_defconfig rename to boards/v2/ti/sk_am62/sk_am62_am6234_m4_defconfig index 561463888c0..8ed54c6554e 100644 --- a/boards/arm/am62x_m4/am62x_m4_sk_defconfig +++ b/boards/v2/ti/sk_am62/sk_am62_am6234_m4_defconfig @@ -6,9 +6,6 @@ # SPDX-License-Identifier: Apache-2.0 # Platform Configuration -CONFIG_SOC_SERIES_AM62X_M4=y -CONFIG_SOC_AM62x_M4=y -CONFIG_BOARD_AM62X_M4_SK=y CONFIG_CORTEX_M_SYSTICK=y # Zephyr Kernel Configuration