From b7cc30aaeaa71316b53b6bea6c515142c48ea523 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Wed, 7 Feb 2024 15:03:34 +0000 Subject: [PATCH] boards: arm: rcar_h3_salvatorx_cr7: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../arm/rcar_h3_salvatorx/Kconfig.board | 6 ------ .../arm/rcar_h3_salvatorx/Kconfig.defconfig | 7 ------- .../renesas/rcar_salvator_x/Kconfig.rcar_salvator_x | 5 +++++ .../rcar_salvator_x}/board.cmake | 0 boards/renesas/rcar_salvator_x/board.yml | 5 +++++ .../doc/img/r-car-h3-salvator-x-connections.jpg | Bin .../rcar_salvator_x}/doc/img/rcar_h3_features.jpg | Bin .../rcar_salvator_x}/doc/img/rcar_h3_salvatorx.jpg | Bin .../rcar_salvator_x/doc/rcar_salvator_x.rst} | 10 +++++----- .../rcar_salvator_x_r8a77951_r7-pinctrl.dtsi} | 0 .../rcar_salvator_x_r8a77951_r7.dts} | 2 +- .../rcar_salvator_x_r8a77951_r7.yaml} | 2 +- .../rcar_salvator_x_r8a77951_r7_defconfig} | 3 --- .../rcar_salvator_x}/support/openocd.cfg | 0 14 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 boards/boards_legacy/arm/rcar_h3_salvatorx/Kconfig.board delete mode 100644 boards/boards_legacy/arm/rcar_h3_salvatorx/Kconfig.defconfig create mode 100644 boards/renesas/rcar_salvator_x/Kconfig.rcar_salvator_x rename boards/{boards_legacy/arm/rcar_h3_salvatorx => renesas/rcar_salvator_x}/board.cmake (100%) create mode 100644 boards/renesas/rcar_salvator_x/board.yml rename boards/{boards_legacy/arm/rcar_h3_salvatorx => renesas/rcar_salvator_x}/doc/img/r-car-h3-salvator-x-connections.jpg (100%) rename boards/{boards_legacy/arm/rcar_h3_salvatorx => renesas/rcar_salvator_x}/doc/img/rcar_h3_features.jpg (100%) rename boards/{boards_legacy/arm/rcar_h3_salvatorx => renesas/rcar_salvator_x}/doc/img/rcar_h3_salvatorx.jpg (100%) rename boards/{boards_legacy/arm/rcar_h3_salvatorx/doc/rcar_h3_salvatorx.rst => renesas/rcar_salvator_x/doc/rcar_salvator_x.rst} (96%) rename boards/{boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7-pinctrl.dtsi => renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7-pinctrl.dtsi} (100%) rename boards/{boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7.dts => renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7.dts} (96%) rename boards/{boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7.yaml => renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7.yaml} (83%) rename boards/{boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7_defconfig => renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7_defconfig} (72%) rename boards/{boards_legacy/arm/rcar_h3_salvatorx => renesas/rcar_salvator_x}/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/Kconfig.board b/boards/boards_legacy/arm/rcar_h3_salvatorx/Kconfig.board deleted file mode 100644 index f0236267f08..00000000000 --- a/boards/boards_legacy/arm/rcar_h3_salvatorx/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 BayLibre, SAS -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RCAR_H3_SALVATORX_CR7 - bool "Cortex-R7 for Renesas H3 Salvator-X" - depends on SOC_R8A77951 diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/Kconfig.defconfig b/boards/boards_legacy/arm/rcar_h3_salvatorx/Kconfig.defconfig deleted file mode 100644 index ccc3ffa89a5..00000000000 --- a/boards/boards_legacy/arm/rcar_h3_salvatorx/Kconfig.defconfig +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2022 BayLibre, SAS -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_RCAR_H3_SALVATORX_CR7 -config BOARD - default "rcar_h3_salvatorx_cr7" -endif # BOARD_RCAR_H3_SALVATORX_CR7 diff --git a/boards/renesas/rcar_salvator_x/Kconfig.rcar_salvator_x b/boards/renesas/rcar_salvator_x/Kconfig.rcar_salvator_x new file mode 100644 index 00000000000..eac2470dc3e --- /dev/null +++ b/boards/renesas/rcar_salvator_x/Kconfig.rcar_salvator_x @@ -0,0 +1,5 @@ +# Copyright (c) 2022 BayLibre, SAS +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RCAR_SALVATOR_X + select SOC_R8A77951_R7 diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/board.cmake b/boards/renesas/rcar_salvator_x/board.cmake similarity index 100% rename from boards/boards_legacy/arm/rcar_h3_salvatorx/board.cmake rename to boards/renesas/rcar_salvator_x/board.cmake diff --git a/boards/renesas/rcar_salvator_x/board.yml b/boards/renesas/rcar_salvator_x/board.yml new file mode 100644 index 00000000000..69988528197 --- /dev/null +++ b/boards/renesas/rcar_salvator_x/board.yml @@ -0,0 +1,5 @@ +board: + name: rcar_salvator_x + vendor: Renesas + socs: + - name: r8a77951 diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/doc/img/r-car-h3-salvator-x-connections.jpg b/boards/renesas/rcar_salvator_x/doc/img/r-car-h3-salvator-x-connections.jpg similarity index 100% rename from boards/boards_legacy/arm/rcar_h3_salvatorx/doc/img/r-car-h3-salvator-x-connections.jpg rename to boards/renesas/rcar_salvator_x/doc/img/r-car-h3-salvator-x-connections.jpg diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/doc/img/rcar_h3_features.jpg b/boards/renesas/rcar_salvator_x/doc/img/rcar_h3_features.jpg similarity index 100% rename from boards/boards_legacy/arm/rcar_h3_salvatorx/doc/img/rcar_h3_features.jpg rename to boards/renesas/rcar_salvator_x/doc/img/rcar_h3_features.jpg diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/doc/img/rcar_h3_salvatorx.jpg b/boards/renesas/rcar_salvator_x/doc/img/rcar_h3_salvatorx.jpg similarity index 100% rename from boards/boards_legacy/arm/rcar_h3_salvatorx/doc/img/rcar_h3_salvatorx.jpg rename to boards/renesas/rcar_salvator_x/doc/img/rcar_h3_salvatorx.jpg diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/doc/rcar_h3_salvatorx.rst b/boards/renesas/rcar_salvator_x/doc/rcar_salvator_x.rst similarity index 96% rename from boards/boards_legacy/arm/rcar_h3_salvatorx/doc/rcar_h3_salvatorx.rst rename to boards/renesas/rcar_salvator_x/doc/rcar_salvator_x.rst index d3b9b292867..e95049a42c4 100644 --- a/boards/boards_legacy/arm/rcar_h3_salvatorx/doc/rcar_h3_salvatorx.rst +++ b/boards/renesas/rcar_salvator_x/doc/rcar_salvator_x.rst @@ -127,12 +127,12 @@ Flashing First of all, open your serial terminal. -Applications for the ``rcar_h3_salvatorx_cr7`` board configuration can be built +Applications for the ``rcar_salvator_x`` board configuration can be built in the usual way (see :ref:`build_an_application` for more details). .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: rcar_h3_salvatorx_cr7 + :board: rcar_salvator_x :goals: flash You should see the following message in the terminal: @@ -140,7 +140,7 @@ You should see the following message in the terminal: .. code-block:: console *** Booting Zephyr OS build v2.6.0-rc1 *** - Hello World! rcar_h3_salvatorx_cr7 + Hello World! rcar_salvator_x Debugging ========= @@ -151,7 +151,7 @@ Here is an example for the :ref:`hello_world` application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: rcar_h3_salvatorx_cr7 + :board: rcar_salvator_x :goals: debug You will then get access to a GDB session for debug. @@ -161,7 +161,7 @@ By continuing the app, you should see the following message in the terminal: .. code-block:: console *** Booting Zephyr OS build v2.6.0-rc1 *** - Hello World! rcar_h3_salvatorx_cr7 + Hello World! rcar_salvator_x References ********** diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7-pinctrl.dtsi b/boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7-pinctrl.dtsi rename to boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7.dts b/boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7.dts similarity index 96% rename from boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7.dts rename to boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7.dts index f953a93a4ed..ce5c046f54a 100644 --- a/boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7.dts +++ b/boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7.dts @@ -7,7 +7,7 @@ /dts-v1/; #include -#include "rcar_h3_salvatorx_cr7-pinctrl.dtsi" +#include "rcar_salvator_x_r8a77951_r7-pinctrl.dtsi" #include / { diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7.yaml b/boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7.yaml similarity index 83% rename from boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7.yaml rename to boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7.yaml index f751adbcc47..589a0ec03a6 100644 --- a/boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7.yaml +++ b/boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7.yaml @@ -1,4 +1,4 @@ -identifier: rcar_h3_salvatorx_cr7 +identifier: rcar_salvator_x/r8a77951/r7 name: Cortex r7 for Renesas H3 Salvator-X type: mcu arch: arm diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7_defconfig b/boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7_defconfig similarity index 72% rename from boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7_defconfig rename to boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7_defconfig index 3cf6bbaa0f2..b70c8f29e22 100644 --- a/boards/boards_legacy/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7_defconfig +++ b/boards/renesas/rcar_salvator_x/rcar_salvator_x_r8a77951_r7_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_R8A77951=y -CONFIG_SOC_SERIES_RCAR_GEN3=y -CONFIG_BOARD_RCAR_H3_SALVATORX_CR7=y CONFIG_CLOCK_CONTROL=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000 CONFIG_CONSOLE=y diff --git a/boards/boards_legacy/arm/rcar_h3_salvatorx/support/openocd.cfg b/boards/renesas/rcar_salvator_x/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/rcar_h3_salvatorx/support/openocd.cfg rename to boards/renesas/rcar_salvator_x/support/openocd.cfg