diff --git a/boards/phytec/phyboard_lyra_am62x/Kconfig.phyboard_lyra_am62x b/boards/phytec/phyboard_lyra/Kconfig.phyboard_lyra similarity index 56% rename from boards/phytec/phyboard_lyra_am62x/Kconfig.phyboard_lyra_am62x rename to boards/phytec/phyboard_lyra/Kconfig.phyboard_lyra index c7c0a6ce87a..93076900cf3 100644 --- a/boards/phytec/phyboard_lyra_am62x/Kconfig.phyboard_lyra_am62x +++ b/boards/phytec/phyboard_lyra/Kconfig.phyboard_lyra @@ -5,8 +5,8 @@ # # 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 +config BOARD_PHYBOARD_LYRA + select SOC_AM6234_A53 if BOARD_PHYBOARD_LYRA_AM6234_A53 + select SOC_AM6234_M4 if BOARD_PHYBOARD_LYRA_AM6234_M4 help PHYTEC phyBOARD-Lyra AM62x M4/A53 diff --git a/boards/phytec/phyboard_lyra_am62x/board.yml b/boards/phytec/phyboard_lyra/board.yml similarity index 63% rename from boards/phytec/phyboard_lyra_am62x/board.yml rename to boards/phytec/phyboard_lyra/board.yml index d91be2b4786..2b98d77f510 100644 --- a/boards/phytec/phyboard_lyra_am62x/board.yml +++ b/boards/phytec/phyboard_lyra/board.yml @@ -1,5 +1,5 @@ board: - name: phyboard_lyra_am62x + name: phyboard_lyra vendor: phytec socs: - name: am6234 diff --git a/boards/phytec/phyboard_lyra_am62x/doc/img/phyCORE-AM62x_Lyra_frontside.webp b/boards/phytec/phyboard_lyra/doc/img/phyCORE-AM62x_Lyra_frontside.webp similarity index 100% rename from boards/phytec/phyboard_lyra_am62x/doc/img/phyCORE-AM62x_Lyra_frontside.webp rename to boards/phytec/phyboard_lyra/doc/img/phyCORE-AM62x_Lyra_frontside.webp diff --git a/boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_a53.rst b/boards/phytec/phyboard_lyra/doc/phyboard_lyra_am62xx_a53.rst similarity index 94% rename from boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_a53.rst rename to boards/phytec/phyboard_lyra/doc/phyboard_lyra_am62xx_a53.rst index d929105d77d..410debfd9b7 100644 --- a/boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_a53.rst +++ b/boards/phytec/phyboard_lyra/doc/phyboard_lyra_am62xx_a53.rst @@ -1,4 +1,4 @@ -.. _phyboard_lyra_am62x_a53: +.. _phyboard_lyra_am62xx_a53: phyBOARD-Lyra AM62x A53 Core ############################ @@ -31,7 +31,7 @@ See the `PHYTEC AM62x Product Page`_ for details. Supported Features ================== -The Zephyr phyboard_lyra_am62x/am6234/a53 board configuration supports the following hardware +The Zephyr phyboard_lyra/am6234/a53 board configuration supports the following hardware features: +-----------+------------+-------------------------------------+ @@ -83,7 +83,7 @@ You can build an application in the usual way. Refer to :ref:`hello_world`. .. zephyr-app-commands:: - :board: phyboard_lyra_am62x/am6234/a53 + :board: phyboard_lyra/am6234/a53 :zephyr-app: samples/hello_world :goals: build diff --git a/boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_m4.rst b/boards/phytec/phyboard_lyra/doc/phyboard_lyra_am62xx_m4.rst similarity index 94% rename from boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_m4.rst rename to boards/phytec/phyboard_lyra/doc/phyboard_lyra_am62xx_m4.rst index 0610eeb951e..a8765c0fcc3 100644 --- a/boards/phytec/phyboard_lyra_am62x/doc/phyboard_lyra_am62x_m4.rst +++ b/boards/phytec/phyboard_lyra/doc/phyboard_lyra_am62xx_m4.rst @@ -1,4 +1,4 @@ -.. _phyboard_lyra_am62x_m4: +.. _phyboard_lyra_am62xx_m4: phyBOARD-Lyra AM62x M4F Core ############################ @@ -43,7 +43,7 @@ specifications are used: Supported Features ================== -The phyboard_lyra_am62x/am6234/m4 configuration supports the following hardware features: +The phyboard_lyra/am6234/m4 configuration supports the following hardware features: +-----------+------------+-------------------------------------+ | Interface | Controller | Driver/Component | @@ -87,7 +87,7 @@ cores of the SoM. These cores will then load the zephyr binary on the M4 core using remoteproc. The default configuration can be found in -:zephyr_file:`boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4_defconfig` +:zephyr_file:`boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4_defconfig` Flashing ******** @@ -101,7 +101,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 phyboard_lyra_am62x/am6234/m4 samples/hello_world + west build -p -b phyboard_lyra/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/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.dts b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_a53.dts similarity index 93% rename from boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.dts rename to boards/phytec/phyboard_lyra/phyboard_lyra_am6234_a53.dts index cd5f60c9d61..adf350b56f9 100644 --- a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.dts +++ b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_a53.dts @@ -10,7 +10,7 @@ / { model = "PHYTEC phyBOARD-Lyra AM62x A53"; - compatible = "phytec,am62x-a53-phyboard-lyra", "ti,am625"; + compatible = "phytec,phyboard-lyra-am62xx-a53", "ti,am625"; chosen { zephyr,console = &uart0; diff --git a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.yaml b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_a53.yaml similarity index 80% rename from boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.yaml rename to boards/phytec/phyboard_lyra/phyboard_lyra_am6234_a53.yaml index a485d1d34d7..5f45c978c2a 100644 --- a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53.yaml +++ b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_a53.yaml @@ -1,4 +1,4 @@ -identifier: phyboard_lyra_am62x/am6234/a53 +identifier: phyboard_lyra/am6234/a53 name: PHYTEC phyBOARD-Lyra AM62x A53 type: mcu arch: arm64 diff --git a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53_defconfig b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_a53_defconfig similarity index 100% rename from boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_a53_defconfig rename to boards/phytec/phyboard_lyra/phyboard_lyra_am6234_a53_defconfig diff --git a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.dts b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4.dts similarity index 95% rename from boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.dts rename to boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4.dts index e5485a5f08d..8112aeba419 100644 --- a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.dts +++ b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4.dts @@ -11,7 +11,7 @@ / { model = "PHYTEC phyBOARD-Lyra AM62x M4"; - compatible = "phytec,am62x-m4-phyboard-lyra", "ti,am625"; + compatible = "phytec,phyboard-lyra-am62xx-m4", "ti,am625"; chosen { zephyr,sram = &sram0; diff --git a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.yaml b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4.yaml similarity index 70% rename from boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.yaml rename to boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4.yaml index 56022da3a3c..0ef24d8f720 100644 --- a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4.yaml +++ b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4.yaml @@ -1,4 +1,4 @@ -identifier: phyboard_lyra_am62x/am6234/m4 +identifier: phyboard_lyra/am6234/m4 name: PHYTEC phyBOARD-Lyra AM62x M4 type: mcu arch: arm diff --git a/boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4_defconfig b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4_defconfig similarity index 100% rename from boards/phytec/phyboard_lyra_am62x/phyboard_lyra_am62x_am6234_m4_defconfig rename to boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4_defconfig