zephyrproject-rtos · soburi · Feb 7, 2024 · Feb 7, 2024
diff --git a/...s_legacy/arm/arduino_uno_r4/Kconfig.board → ...o_r4_minima/Kconfig.arduino_uno_r4_minima b/...s_legacy/arm/arduino_uno_r4/Kconfig.board → ...o_r4_minima/Kconfig.arduino_uno_r4_minima
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_ARDUINO_UNO_R4_MINIMA
-	bool "Arduino Uno R4 Minima board"
-	depends on SOC_R7FA4M1AB3CFM
+	select SOC_R7FA4M1AB3CFM
diff --git a/...uno_r4/arduino_uno_r4_minima-pinctrl.dtsi → ...minima/arduino_uno_r4_minima-pinctrl.dtsi b/...uno_r4/arduino_uno_r4_minima-pinctrl.dtsi → ...minima/arduino_uno_r4_minima-pinctrl.dtsi
diff --git a/.../arduino_uno_r4/arduino_uno_r4_minima.dts → ...o_uno_r4_minima/arduino_uno_r4_minima.dts b/.../arduino_uno_r4/arduino_uno_r4_minima.dts → ...o_uno_r4_minima/arduino_uno_r4_minima.dts
@@ -6,13 +6,14 @@
 
 /dts-v1/;
 
+#include <renesas/ra/r7fa4m1ab3cfm.dtsi>
 #include <zephyr/dt-bindings/gpio/gpio.h>
 
-#include "arduino_uno_r4_common.dtsi"
 #include "arduino_uno_r4_minima-pinctrl.dtsi"
 
 / {
 	model = "Arduino Uno R4 Minima";
+        compatible = "arduino,uno-r4-minima";
 
 	chosen {
 		zephyr,console = &uart2;

diff --git a/...arduino_uno_r4/arduino_uno_r4_minima.yaml → ..._uno_r4_minima/arduino_uno_r4_minima.yaml b/...arduino_uno_r4/arduino_uno_r4_minima.yaml → ..._uno_r4_minima/arduino_uno_r4_minima.yaml
diff --git a/...no_uno_r4/arduino_uno_r4_minima_defconfig → ...r4_minima/arduino_uno_r4_minima_defconfig b/...no_uno_r4/arduino_uno_r4_minima_defconfig → ...r4_minima/arduino_uno_r4_minima_defconfig
@@ -1,12 +1,9 @@
 # Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_RA4M1=y
-CONFIG_SOC_R7FA4M1AB3CFM=y
-
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000
 
-CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_USE_DT_CODE_PARTITION=y
 
 # enable uart driver
 CONFIG_SERIAL=y
@@ -15,12 +12,3 @@ CONFIG_UART_INTERRUPT_DRIVEN=y
 # enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-CONFIG_PINCTRL=y
-
-CONFIG_CLOCK_CONTROL=y
-
-CONFIG_USE_DT_CODE_PARTITION=y
diff --git a/...rds_legacy/arm/arduino_uno_r4/board.cmake → ...arduino/arduino_uno_r4_minima/board.cmake b/...rds_legacy/arm/arduino_uno_r4/board.cmake → ...arduino/arduino_uno_r4_minima/board.cmake
diff --git a/boards/arduino/arduino_uno_r4_minima/board.yml b/boards/arduino/arduino_uno_r4_minima/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: arduino_uno_r4_minima
+  vendor: GigaDevice Semiconductor
+  socs:
+    - name: r7fa4m1ab3cfm
diff --git a/boards/arduino/arduino_uno_r4_minima/doc/img/gd32f407v_start.webp b/boards/arduino/arduino_uno_r4_minima/doc/img/gd32f407v_start.webp
diff --git a/...s_legacy/arm/arduino_uno_r4/doc/index.rst → ...duino/arduino_uno_r4_minima/doc/index.rst b/...s_legacy/arm/arduino_uno_r4/doc/index.rst → ...duino/arduino_uno_r4_minima/doc/index.rst
diff --git a/boards/boards_legacy/arm/arduino_uno_r4/Kconfig.defconfig b/boards/boards_legacy/arm/arduino_uno_r4/Kconfig.defconfig
diff --git a/boards/boards_legacy/arm/arduino_uno_r4/arduino_uno_r4_common.dtsi b/boards/boards_legacy/arm/arduino_uno_r4/arduino_uno_r4_common.dtsi
diff --git a/soc/soc_legacy/arm/renesas_ra/CMakeLists.txt → soc/renesas_ra/CMakeLists.txt b/soc/soc_legacy/arm/renesas_ra/CMakeLists.txt → soc/renesas_ra/CMakeLists.txt
diff --git a/...c_legacy/arm/renesas_ra/Kconfig.defconfig → soc/renesas_ra/Kconfig b/...c_legacy/arm/renesas_ra/Kconfig.defconfig → soc/renesas_ra/Kconfig
@@ -1,4 +1,7 @@
 # Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
 # SPDX-License-Identifier: Apache-2.0
 
-source "soc/soc_legacy/arm/renesas_ra/*/Kconfig.defconfig.series"
+config SOC_FAMILY_RENESAS_RA
+	select BUILD_OUTPUT_HEX
+
+rsource "*/Kconfig"
diff --git a/soc/renesas_ra/Kconfig.defconfig b/soc/renesas_ra/Kconfig.defconfig
@@ -0,0 +1,14 @@
+# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_FAMILY_RENESAS_RA
+
+rsource "*/Kconfig.defconfig.series"
+
+config PINCTRL
+	default y
+
+config CLOCK_CONTROL
+	default y
+
+endif # SOC_FAMILY_RENESAS_RA
diff --git a/soc/renesas_ra/Kconfig.soc b/soc/renesas_ra/Kconfig.soc
@@ -0,0 +1,10 @@
+# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_FAMILY_RENESAS_RA
+	bool
+
+config SOC_FAMILY
+	default "renesas_ra" if SOC_FAMILY_RENESAS_RA
+
+rsource "*/Kconfig.soc"
diff --git a/...legacy/arm/renesas_ra/common/pinctrl_ra.h → soc/renesas_ra/common/pinctrl_ra.h b/...legacy/arm/renesas_ra/common/pinctrl_ra.h → soc/renesas_ra/common/pinctrl_ra.h
diff --git a/...acy/arm/renesas_ra/common/ra_common_soc.h → soc/renesas_ra/common/ra_common_soc.h b/...acy/arm/renesas_ra/common/ra_common_soc.h → soc/renesas_ra/common/ra_common_soc.h
diff --git a/soc/renesas_ra/ra4m1/CMakeLists.txt b/soc/renesas_ra/ra4m1/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_include_directories(.)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/...egacy/arm/renesas_ra/ra4m1/Kconfig.series → soc/renesas_ra/ra4m1/Kconfig b/...egacy/arm/renesas_ra/ra4m1/Kconfig.series → soc/renesas_ra/ra4m1/Kconfig
@@ -8,6 +8,6 @@ config SOC_SERIES_RA4M1
 	select CPU_HAS_ARM_MPU
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select DYNAMIC_INTERRUPTS
-	select SOC_FAMILY_RA
+	select SOC_FAMILY_RENESAS_RA
 	select TIMER_READS_ITS_FREQUENCY_AT_RUNTIME
 	select XIP
diff --git a/..._ra/ra4m1/Kconfig.defconfig.r7fa4m1xxxxxx → ..._ra/ra4m1/Kconfig.defconfig.r7fa4m1xxxxxx b/..._ra/ra4m1/Kconfig.defconfig.r7fa4m1xxxxxx → ..._ra/ra4m1/Kconfig.defconfig.r7fa4m1xxxxxx
diff --git a/...renesas_ra/ra4m1/Kconfig.defconfig.series → ...renesas_ra/ra4m1/Kconfig.defconfig.series b/...renesas_ra/ra4m1/Kconfig.defconfig.series → ...renesas_ra/ra4m1/Kconfig.defconfig.series
diff --git a/soc/renesas_ra/ra4m1/Kconfig.soc b/soc/renesas_ra/ra4m1/Kconfig.soc
@@ -0,0 +1,17 @@
+# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RA4M1
+	bool
+	help
+	  Renesas RA4M1 SoC Selection
+
+config SOC_SERIES
+	default "ra4m1" if SOC_SERIES_RA4M1
+
+config SOC_R7FA4M1AB3CFM
+	bool
+	select SOC_SERIES_RA4M1
+
+config SOC
+	default "r7fa4m1ab3cfm" if SOC_R7FAM1AB3CFM
diff --git a/...soc_legacy/arm/renesas_ra/ra4m1/linker.ld → soc/renesas_ra/ra4m1/linker.ld b/...soc_legacy/arm/renesas_ra/ra4m1/linker.ld → soc/renesas_ra/ra4m1/linker.ld
diff --git a/...legacy/arm/renesas_ra/ra4m1/pinctrl_soc.h → soc/renesas_ra/ra4m1/pinctrl_soc.h b/...legacy/arm/renesas_ra/ra4m1/pinctrl_soc.h → soc/renesas_ra/ra4m1/pinctrl_soc.h
diff --git a/soc/soc_legacy/arm/renesas_ra/ra4m1/soc.h → soc/renesas_ra/ra4m1/soc.h b/soc/soc_legacy/arm/renesas_ra/ra4m1/soc.h → soc/renesas_ra/ra4m1/soc.h
diff --git a/soc/renesas_ra/soc.yml b/soc/renesas_ra/soc.yml
@@ -0,0 +1,6 @@
+family:
+- name: renesas_ra
+  series:
+  - name: ra4
+    socs:
+    - name: r7fa4m1ab3cfm
diff --git a/soc/soc_legacy/arm/renesas_ra/Kconfig b/soc/soc_legacy/arm/renesas_ra/Kconfig
diff --git a/soc/soc_legacy/arm/renesas_ra/Kconfig.soc b/soc/soc_legacy/arm/renesas_ra/Kconfig.soc
diff --git a/soc/soc_legacy/arm/renesas_ra/ra4m1/CMakeLists.txt b/soc/soc_legacy/arm/renesas_ra/ra4m1/CMakeLists.txt
diff --git a/soc/soc_legacy/arm/renesas_ra/ra4m1/Kconfig.soc b/soc/soc_legacy/arm/renesas_ra/ra4m1/Kconfig.soc