boards: arm and arm64: rcar_h3ulcb: Convert to v2

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>
zephyrproject-rtos · Feb 8, 2024 · 99b129d · 99b129d
1 parent c47dbb0
commit 99b129d
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 120 deletions.
diff --git a/boards/boards_legacy/arm/rcar_h3ulcb/Kconfig.board b/boards/boards_legacy/arm/rcar_h3ulcb/Kconfig.board
diff --git a/boards/boards_legacy/arm/rcar_h3ulcb/Kconfig.defconfig b/boards/boards_legacy/arm/rcar_h3ulcb/Kconfig.defconfig
diff --git a/boards/boards_legacy/arm/rcar_h3ulcb/support/openocd.cfg b/boards/boards_legacy/arm/rcar_h3ulcb/support/openocd.cfg
diff --git a/boards/boards_legacy/arm64/rcar_h3ulcb_ca57/Kconfig.board b/boards/boards_legacy/arm64/rcar_h3ulcb_ca57/Kconfig.board
diff --git a/.../arm64/rcar_h3ulcb_ca57/Kconfig.defconfig → boards/renesas/rcar_h3ulcb/Kconfig.defconfig b/.../arm64/rcar_h3ulcb_ca57/Kconfig.defconfig → boards/renesas/rcar_h3ulcb/Kconfig.defconfig
@@ -1,12 +1,9 @@
 # Copyright (c) 2023 EPAM Systems
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_RCAR_H3ULCB_CA57
-
-config BOARD
-	default "rcar_h3ulcb_ca57"
+if BOARD_RCAR_H3ULCB
 
 config BUILD_OUTPUT_BIN
 	default y
 
-endif # BOARD_RCAR_H3ULCB_CA57
+endif # BOARD_RCAR_H3ULCB
diff --git a/boards/renesas/rcar_h3ulcb/Kconfig.rcar_h3ulcb b/boards/renesas/rcar_h3ulcb/Kconfig.rcar_h3ulcb
@@ -0,0 +1,10 @@
+# Copyright (c) 2023 EPAM Systems
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RCAR_H3ULCB_R8A77951_R7
+	bool
+	select SOC_R8A77951_R7
+
+config BOARD_RCAR_H3ULCB_R8A77951_A57
+	bool
+	select SOC_R8A77951_A57
diff --git a/...boards_legacy/arm/rcar_h3ulcb/board.cmake → boards/renesas/rcar_h3ulcb/board.cmake b/...boards_legacy/arm/rcar_h3ulcb/board.cmake → boards/renesas/rcar_h3ulcb/board.cmake
@@ -1,3 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
+
+#r7 only:
 board_runner_args(openocd "--use-elf")
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/renesas/rcar_h3ulcb/board.yml b/boards/renesas/rcar_h3ulcb/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: rcar_h3ulcb
+  vendor: Renesas
+  socs:
+  - name: r8a77951
diff --git a/...3ulcb_ca57/doc/img/rcar_h3ulcb_bottom.jpg → ...car_h3ulcb/doc/img/rcar_h3ulcb_bottom.jpg b/...3ulcb_ca57/doc/img/rcar_h3ulcb_bottom.jpg → ...car_h3ulcb/doc/img/rcar_h3ulcb_bottom.jpg
diff --git a/...r_h3ulcb/doc/img/rcar_h3ulcb_features.jpg → ...r_h3ulcb/doc/img/rcar_h3ulcb_features.jpg b/...r_h3ulcb/doc/img/rcar_h3ulcb_features.jpg → ...r_h3ulcb/doc/img/rcar_h3ulcb_features.jpg
diff --git a/...3ulcb/doc/img/rcar_h3ulcb_starter_kit.jpg → ...3ulcb/doc/img/rcar_h3ulcb_starter_kit.jpg b/...3ulcb/doc/img/rcar_h3ulcb_starter_kit.jpg → ...3ulcb/doc/img/rcar_h3ulcb_starter_kit.jpg
diff --git a/...r_h3ulcb_ca57/doc/img/rcar_h3ulcb_top.jpg → ...s/rcar_h3ulcb/doc/img/rcar_h3ulcb_top.jpg b/...r_h3ulcb_ca57/doc/img/rcar_h3ulcb_top.jpg → ...s/rcar_h3ulcb/doc/img/rcar_h3ulcb_top.jpg
diff --git a/...gacy/arm64/rcar_h3ulcb_ca57/doc/index.rst → ...nesas/rcar_h3ulcb/doc/rcar_h3ulcb_a57.rst b/...gacy/arm64/rcar_h3ulcb_ca57/doc/index.rst → ...nesas/rcar_h3ulcb/doc/rcar_h3ulcb_a57.rst
diff --git a/...egacy/arm/rcar_h3ulcb/doc/rcar_h3ulcb.rst → ...enesas/rcar_h3ulcb/doc/rcar_h3ulcb_r7.rst b/...egacy/arm/rcar_h3ulcb/doc/rcar_h3ulcb.rst → ...enesas/rcar_h3ulcb/doc/rcar_h3ulcb_r7.rst
diff --git a/...h3ulcb_ca57/rcar_h3ulcb_ca57-pinctrl.dtsi → ...lcb/rcar_h3ulcb_r8a77951_a57-pinctrl.dtsi b/...h3ulcb_ca57/rcar_h3ulcb_ca57-pinctrl.dtsi → ...lcb/rcar_h3ulcb_r8a77951_a57-pinctrl.dtsi
diff --git a/...m64/rcar_h3ulcb_ca57/rcar_h3ulcb_ca57.dts → .../rcar_h3ulcb/rcar_h3ulcb_r8a77951_a57.dts b/...m64/rcar_h3ulcb_ca57/rcar_h3ulcb_ca57.dts → .../rcar_h3ulcb/rcar_h3ulcb_r8a77951_a57.dts
@@ -8,7 +8,7 @@
 /dts-v1/;
 #include <mem.h>
 #include <arm64/renesas/r8a77951.dtsi>
-#include "rcar_h3ulcb_ca57-pinctrl.dtsi"
+#include "rcar_h3ulcb_r8a77951_a57-pinctrl.dtsi"
 
 / {
 	model = "H3ULCB CA57";

diff --git a/...64/rcar_h3ulcb_ca57/rcar_h3ulcb_ca57.yaml → ...rcar_h3ulcb/rcar_h3ulcb_r8a77951_a57.yaml b/...64/rcar_h3ulcb_ca57/rcar_h3ulcb_ca57.yaml → ...rcar_h3ulcb/rcar_h3ulcb_r8a77951_a57.yaml
diff --git a/...ar_h3ulcb_ca57/rcar_h3ulcb_ca57_defconfig → ...h3ulcb/rcar_h3ulcb_r8a77951_a57_defconfig b/...ar_h3ulcb_ca57/rcar_h3ulcb_ca57_defconfig → ...h3ulcb/rcar_h3ulcb_r8a77951_a57_defconfig
@@ -1,6 +1,3 @@
-CONFIG_SOC_ARM64_R8A77951=y
-CONFIG_SOC_SERIES_RCAR_GEN3=y
-CONFIG_BOARD_RCAR_H3ULCB_CA57=y
 
 # Cache management
 CONFIG_CACHE_MANAGEMENT=y

diff --git a/.../rcar_h3ulcb/rcar_h3ulcb_cr7-pinctrl.dtsi → ...ulcb/rcar_h3ulcb_r8a77951_r7-pinctrl.dtsi b/.../rcar_h3ulcb/rcar_h3ulcb_cr7-pinctrl.dtsi → ...ulcb/rcar_h3ulcb_r8a77951_r7-pinctrl.dtsi
diff --git a/...egacy/arm/rcar_h3ulcb/rcar_h3ulcb_cr7.dts → ...s/rcar_h3ulcb/rcar_h3ulcb_r8a77951_r7.dts b/...egacy/arm/rcar_h3ulcb/rcar_h3ulcb_cr7.dts → ...s/rcar_h3ulcb/rcar_h3ulcb_r8a77951_r7.dts
@@ -7,7 +7,7 @@
 
 /dts-v1/;
 #include <arm/renesas/rcar/gen3/r8a77951.dtsi>
-#include "rcar_h3ulcb_cr7-pinctrl.dtsi"
+#include "rcar_h3ulcb_r8a77951_r7-pinctrl.dtsi"
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 
 / {

diff --git a/...gacy/arm/rcar_h3ulcb/rcar_h3ulcb_cr7.yaml → .../rcar_h3ulcb/rcar_h3ulcb_r8a77951_r7.yaml b/...gacy/arm/rcar_h3ulcb/rcar_h3ulcb_cr7.yaml → .../rcar_h3ulcb/rcar_h3ulcb_r8a77951_r7.yaml
diff --git a/...arm/rcar_h3ulcb/rcar_h3ulcb_cr7_defconfig → ..._h3ulcb/rcar_h3ulcb_r8a77951_r7_defconfig b/...arm/rcar_h3ulcb/rcar_h3ulcb_cr7_defconfig → ..._h3ulcb/rcar_h3ulcb_r8a77951_r7_defconfig
@@ -1,6 +1,3 @@
-CONFIG_SOC_R8A77951=y
-CONFIG_SOC_SERIES_RCAR_GEN3=y
-CONFIG_BOARD_RCAR_H3ULCB_CR7=y
 CONFIG_CLOCK_CONTROL=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000
 CONFIG_CONSOLE=y