soc: ra: Port to HWMv2

Ports the ra SoC configuration to hardware model version 2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

soc/renesas/ra/Kconfig

@@ -1,18 +1,11 @@
 # Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_FAMILY_RA
-	bool
-
-if SOC_FAMILY_RA
-
-config SOC_FAMILY
-	string
-	default "renesas_ra"
+if SOC_FAMILY_RENESAS_RA
 
 config SERIES_SPECIFIC_SOC_INIT
 	bool "Use series specific initialize"
 
-source "soc/soc_legacy/arm/renesas_ra/*/Kconfig.soc"
+rsource "*/Kconfig"
 
-endif # SOC_FAMILY_RA
+endif # SOC_FAMILY_RENESAS_RA

soc/renesas/ra/Kconfig.defconfig

@@ -1,9 +1,8 @@
 # Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_R7FA4M1AB3CFM
+if SOC_FAMILY_RENESAS_RA
 
-config SOC
-	default "r7fa4m1ab3cfm"
+rsource "*/Kconfig.defconfig"
 
-endif # SOC_R7FA4M1AB3CFM
+endif # SOC_FAMILY_RENESAS_RA

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"

soc/renesas/ra/ra4m1/CMakeLists.txt

@@ -1,4 +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 "")

soc/renesas/ra/ra4m1/Kconfig

@@ -2,12 +2,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_RA4M1
-	bool "Renesas RA4M1"
 	select ARM
 	select CPU_CORTEX_M4
 	select CPU_HAS_ARM_MPU
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select DYNAMIC_INTERRUPTS
-	select SOC_FAMILY_RA
 	select TIMER_READS_ITS_FREQUENCY_AT_RUNTIME
 	select XIP

soc/renesas/ra/ra4m1/Kconfig.defconfig

@@ -3,11 +3,6 @@
 
 if SOC_SERIES_RA4M1
 
-rsource "Kconfig.defconfig.r7fa4*"
-
-config SOC_SERIES
-	default "ra4m1"
-
 config NUM_IRQS
 	default 32
 

soc/renesas/ra/ra4m1/Kconfig.soc

@@ -0,0 +1,20 @@
+# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RA4M1
+	bool
+	select SOC_FAMILY_RENESAS_RA
+	help
+	  Renesas RA4M1
+
+config SOC_R7FA4M1AB3CFM
+	bool
+	select SOC_SERIES_RA4M1
+	help
+	  R7FA4M1AB3CFM
+
+config SOC_SERIES
+	default "ra4m1" if SOC_SERIES_RA4M1
+
+config SOC
+	default "r7fa4m1ab3cfm" if SOC_R7FA4M1AB3CFM

soc/renesas/ra/soc.yml

@@ -0,0 +1,6 @@
+family:
+  - name: renesas_ra
+    series:
+      - name: ra4m1
+        socs:
+          - name: r7fa4m1ab3cfm

soc/soc_legacy/arm/renesas_ra/Kconfig.defconfig

@@ -1,4 +0,0 @@
-# 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"

soc/soc_legacy/arm/renesas_ra/Kconfig.soc

@@ -1,4 +0,0 @@
-# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
-# SPDX-License-Identifier: Apache-2.0
-
-source "soc/soc_legacy/arm/renesas_ra/*/Kconfig.series"

soc/soc_legacy/arm/renesas_ra/ra4m1/Kconfig.soc

@@ -1,11 +0,0 @@
-# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-	prompt "Renesas RA4M1 SoC Selection"
-	depends on SOC_SERIES_RA4M1
-
-config SOC_R7FA4M1AB3CFM
-	bool "R7FA4M1AB3CFM"
-
-endchoice