From 74f6ca71def19e8d3a16ec8fcc215f87db39b580 Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Fri, 29 Mar 2024 15:48:38 -0700 Subject: [PATCH] boards: phytec: Merge AM62 A53 into phyboard_lyra_am62x phyBOARD-Lyra AM62x is the official name for our kit, which we use to develop our reference software. This kit includes the phyCORE-AM62x with TI's AM62x SoC. Rename the phycore_am62x_am6234_a53 board to phyboard_lyra_am62x_am6234_a53 and move all code into the phyboard_lyra_am62x directory. Thereby, the A53 and M4 boards are located in the same directory and both named correctly. This is also a good chance to update documentation for both cores and use links to our latest BSPs as well as our official AM62x Yocto machine name for the AM62x HS-FS SOM. Signed-off-by: Daniel Schultz --- .../Kconfig.phyboard_lyra_am62x | 5 ++-- .../doc/phyboard_lyra_am62x_a53.rst} | 29 +++++++++++-------- .../{index.rst => phyboard_lyra_am62x_m4.rst} | 18 ++++++------ .../phyboard_lyra_am62x_am6234_a53.dts} | 4 +-- .../phyboard_lyra_am62x_am6234_a53.yaml} | 6 ++-- .../phyboard_lyra_am62x_am6234_a53_defconfig} | 0 .../phyboard_lyra_am62x_am6234_m4.dts | 2 +- .../phyboard_lyra_am62x_am6234_m4.yaml | 2 +- .../phyboard_lyra_am62x_am6234_m4_defconfig | 2 +- .../phycore_am62x/Kconfig.phycore_am62x | 5 ---- boards/phytec/phycore_am62x/board.yml | 5 ---- 11 files changed, 37 insertions(+), 41 deletions(-) rename boards/phytec/{phycore_am62x/doc/index.rst => phyboard_lyra_am62x/doc/phyboard_lyra_am62x_a53.rst} (73%) rename boards/phytec/phyboard_lyra_am62x/doc/{index.rst => phyboard_lyra_am62x_m4.rst} (86%) rename boards/phytec/{phycore_am62x/phycore_am62x_am6234_a53.dts => phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.dts} (89%) rename boards/phytec/{phycore_am62x/phycore_am62x_am6234_a53.yaml => phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.yaml} (56%) rename boards/phytec/{phycore_am62x/phycore_am62x_am6234_a53_defconfig => phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53_defconfig} (100%) delete mode 100644 boards/phytec/phycore_am62x/Kconfig.phycore_am62x delete mode 100644 boards/phytec/phycore_am62x/board.yml diff --git a/boards/phytec/phyboard_lyra_am62x/Kconfig.phyboard_lyra_am62x b/boards/phytec/phyboard_lyra_am62x/Kconfig.phyboard_lyra_am62x index 1b9c5eb8161..c7c0a6ce87a 100644 --- a/boards/phytec/phyboard_lyra_am62x/Kconfig.phyboard_lyra_am62x +++ b/boards/phytec/phyboard_lyra_am62x/Kconfig.phyboard_lyra_am62x @@ -1,4 +1,4 @@ -# Texas Instruments Sitara AM62x-SK-M4 EVM +# PHYTEC phyBOARD-Lyra AM62x M4/A53 # # Copyright (c) 2023 Texas Instruments Incorporated # Copyright (c) 2023 L Lakshmanan @@ -6,6 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_PHYBOARD_LYRA_AM62X + select SOC_AM6234_A53 if BOARD_PHYBOARD_LYRA_AM62X_AM6234_A53 select SOC_AM6234_M4 if BOARD_PHYBOARD_LYRA_AM62X_AM6234_M4 help - PHYTEC AM62x M4 phyBOARD-Lyra + PHYTEC phyBOARD-Lyra AM62x M4/A53 diff --git a/boards/phytec/phycore_am62x/doc/index.rst b/boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_a53.rst similarity index 73% rename from boards/phytec/phycore_am62x/doc/index.rst rename to boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_a53.rst index fd711350fe3..d929105d77d 100644 --- a/boards/phytec/phycore_am62x/doc/index.rst +++ b/boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_a53.rst @@ -1,12 +1,12 @@ -.. _phycore_am62x_a53: +.. _phyboard_lyra_am62x_a53: -PHYTEC phyCORE-AM62x (Cortex-A53) -################################# +phyBOARD-Lyra AM62x A53 Core +############################ Overview ******** -PHYTEC phyCORE-AM62x board is based on TI Sitara applications +PHYTEC phyBOARD-Lyra AM62x board is based on TI Sitara applications processor, composed of a quad Cortex®-A53 cluster and a single Cortex®-M4 core. Zephyr OS is ported to run on the Cortex®-A53 core. @@ -20,13 +20,18 @@ Zephyr OS is ported to run on the Cortex®-A53 core. - 4KB EEPROM - Ethernet -More information about the board can be found at the -`PHYTEC website`_. +See the `PHYTEC AM62x Product Page`_ for details. + +.. figure:: img/phyCORE-AM62x_Lyra_frontside.webp + :align: center + :alt: phyBOARD-Lyra AM62x + + PHYTEC phyBOARD-Lyra with the phyCORE-AM62x SoM Supported Features ================== -The Zephyr phycore_am62x_a53 board configuration supports the following hardware +The Zephyr phyboard_lyra_am62x/am6234/a53 board configuration supports the following hardware features: +-----------+------------+-------------------------------------+ @@ -68,7 +73,7 @@ bmap-tools on a SD-card. .. code-block:: console - bmaptool copy phytec-qt5demo-image-phyboard-lyra-am62xx-2.wic.xz /dev/sdX + bmaptool copy phytec-qt5demo-image-phyboard-lyra-am62xx-3.wic.xz /dev/sdX Building ******** @@ -78,7 +83,7 @@ You can build an application in the usual way. Refer to :ref:`hello_world`. .. zephyr-app-commands:: - :board: phycore_am62x/am6234/a53 + :board: phyboard_lyra_am62x/am6234/a53 :zephyr-app: samples/hello_world :goals: build @@ -99,11 +104,11 @@ Use U-Boot to load and kick zephyr.bin: .. References -.. _PHYTEC website: +.. _PHYTEC AM62x Product Page: https://www.phytec.com/product/phycore-am62x/ .. _WIC: - https://download.phytec.de/Software/Linux/BSP-Yocto-AM62x/BSP-Yocto-AM62x-PD23.1.0/images/yogurt/phyboard-lyra-am62xx-2/phytec-qt5demo-image-phyboard-lyra-am62xx-2.wic.xz + https://download.phytec.de/Software/Linux/BSP-Yocto-AM62x/BSP-Yocto-Ampliphy-AM62x-PD23.2.1/images/ampliphy-xwayland/phyboard-lyra-am62xx-3/phytec-qt5demo-image-phyboard-lyra-am62xx-3.wic.xz .. _Bmap: - https://download.phytec.de/Software/Linux/BSP-Yocto-AM62x/BSP-Yocto-AM62x-PD23.1.0/images/yogurt/phyboard-lyra-am62xx-2/phytec-qt5demo-image-phyboard-lyra-am62xx-2.wic.bmap + https://download.phytec.de/Software/Linux/BSP-Yocto-AM62x/BSP-Yocto-Ampliphy-AM62x-PD23.2.1/images/ampliphy-xwayland/phyboard-lyra-am62xx-3/phytec-qt5demo-image-phyboard-lyra-am62xx-3.wic.bmap diff --git a/boards/phytec/phyboard_lyra_am62x/doc/index.rst b/boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_m4.rst similarity index 86% rename from boards/phytec/phyboard_lyra_am62x/doc/index.rst rename to boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_m4.rst index f18636318fd..0610eeb951e 100644 --- a/boards/phytec/phyboard_lyra_am62x/doc/index.rst +++ b/boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_m4.rst @@ -1,12 +1,12 @@ -.. _am62x_m4_phyboard_lyra: +.. _phyboard_lyra_am62x_m4: -AM62x phyBOARD-Lyra M4F Core +phyBOARD-Lyra AM62x M4F Core ############################ Overview ******** -The AM62x phyBOARD-Lyra board configuration is used by Zephyr applications +The phyBOARD-Lyra AM62x 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 `PHYTEC AM62x Product Page`_ for details. .. figure:: img/phyCORE-AM62x_Lyra_frontside.webp :align: center - :alt: AM62x phyBOARD-Lyra + :alt: phyBOARD-Lyra AM62x PHYTEC phyBOARD-Lyra with the phyCORE-AM62x SoM Hardware ******** -The AM62x phyBOARD-Lyra kit features the AM62x SoC, which is composed of a +The phyBOARD-Lyra AM62x kit 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: @@ -43,7 +43,7 @@ specifications are used: Supported Features ================== -The am62x_m4_phyboard_lyra configuration supports the following hardware features: +The phyboard_lyra_am62x/am6234/m4 configuration supports the following hardware features: +-----------+------------+-------------------------------------+ | Interface | Controller | Driver/Component | @@ -136,10 +136,10 @@ port. https://www.phytec.com/product/phycore-am62x/ .. _WIC: - https://download.phytec.de/Software/Linux/BSP-Yocto-AM62x/BSP-Yocto-AM62x-PD23.1.0/images/yogurt/phyboard-lyra-am62xx-2/phytec-qt5demo-image-phyboard-lyra-am62xx-2.wic.xz + https://download.phytec.de/Software/Linux/BSP-Yocto-AM62x/BSP-Yocto-Ampliphy-AM62x-PD23.2.1/images/ampliphy-xwayland/phyboard-lyra-am62xx-3/phytec-qt5demo-image-phyboard-lyra-am62xx-3.wic.xz .. _BMAP: - https://download.phytec.de/Software/Linux/BSP-Yocto-AM62x/BSP-Yocto-AM62x-PD23.1.0/images/yogurt/phyboard-lyra-am62xx-2/phytec-qt5demo-image-phyboard-lyra-am62xx-2.wic.bmap + https://download.phytec.de/Software/Linux/BSP-Yocto-AM62x/BSP-Yocto-Ampliphy-AM62x-PD23.2.1/images/ampliphy-xwayland/phyboard-lyra-am62xx-3/phytec-qt5demo-image-phyboard-lyra-am62xx-3.wic.bmap .. _phyBOARD SD Card Booting Essentials: - https://docs.phytec.com/latest/phycore-am62x/bootingessentials/sdcard.html + https://docs.phytec.com/projects/yocto-phycore-am62x/en/bsp-yocto-ampliphy-am62x-pd23.2.1/bootingessentials/sdcard.html diff --git a/boards/phytec/phycore_am62x/phycore_am62x_am6234_a53.dts b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.dts similarity index 89% rename from boards/phytec/phycore_am62x/phycore_am62x_am6234_a53.dts rename to boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.dts index 7ab205e9d86..cd5f60c9d61 100644 --- a/boards/phytec/phycore_am62x/phycore_am62x_am6234_a53.dts +++ b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.dts @@ -9,8 +9,8 @@ #include / { - model = "PHYTEC phyCORE-AM62x A53"; - compatible = "ti,am6234"; + model = "PHYTEC phyBOARD-Lyra AM62x A53"; + compatible = "phytec,am62x-a53-phyboard-lyra", "ti,am625"; chosen { zephyr,console = &uart0; diff --git a/boards/phytec/phycore_am62x/phycore_am62x_am6234_a53.yaml b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.yaml similarity index 56% rename from boards/phytec/phycore_am62x/phycore_am62x_am6234_a53.yaml rename to boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.yaml index b12e8863b50..a485d1d34d7 100644 --- a/boards/phytec/phycore_am62x/phycore_am62x_am6234_a53.yaml +++ b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.yaml @@ -1,5 +1,5 @@ -identifier: phycore_am62x/am6234/a53 -name: PHYTEC phyCORE-AM62x A53 +identifier: phyboard_lyra_am62x/am6234/a53 +name: PHYTEC phyBOARD-Lyra AM62x A53 type: mcu arch: arm64 toolchain: @@ -10,4 +10,4 @@ testing: ignore_tags: - net - bluetooth -vendor: ti +vendor: phytec diff --git a/boards/phytec/phycore_am62x/phycore_am62x_am6234_a53_defconfig b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53_defconfig similarity index 100% rename from boards/phytec/phycore_am62x/phycore_am62x_am6234_a53_defconfig rename to boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53_defconfig diff --git a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.dts b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.dts index ba370240340..e5485a5f08d 100644 --- a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.dts +++ b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.dts @@ -10,7 +10,7 @@ #include / { - model = "PHYTEC AM62x M4 phyBOARD-Lyra"; + model = "PHYTEC phyBOARD-Lyra AM62x M4"; compatible = "phytec,am62x-m4-phyboard-lyra", "ti,am625"; chosen { diff --git a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.yaml b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.yaml index df0e8ec65bd..56022da3a3c 100644 --- a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.yaml +++ b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.yaml @@ -1,5 +1,5 @@ identifier: phyboard_lyra_am62x/am6234/m4 -name: PHYTEC AM62x M4 phyBOARD-Lyra +name: PHYTEC phyBOARD-Lyra AM62x M4 type: mcu arch: arm toolchain: diff --git a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4_defconfig b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4_defconfig index 7e20705fa3f..a54f04a25e1 100644 --- a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4_defconfig +++ b/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4_defconfig @@ -1,4 +1,4 @@ -# PHYTEC AM62x M4 phyBOARD-Lyra +# PHYTEC phyBOARD-Lyra AM62x M4 # # Copyright (C) 2023 PHYTEC Messtechnik GmbH # Author: Daniel Schultz diff --git a/boards/phytec/phycore_am62x/Kconfig.phycore_am62x b/boards/phytec/phycore_am62x/Kconfig.phycore_am62x deleted file mode 100644 index 8c66cb29198..00000000000 --- a/boards/phytec/phycore_am62x/Kconfig.phycore_am62x +++ /dev/null @@ -1,5 +0,0 @@ -# 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/phytec/phycore_am62x/board.yml b/boards/phytec/phycore_am62x/board.yml deleted file mode 100644 index ae8e3412ff4..00000000000 --- a/boards/phytec/phycore_am62x/board.yml +++ /dev/null @@ -1,5 +0,0 @@ -board: - name: phycore_am62x - vendor: phytec - socs: - - name: am6234