soc: m46x: Port to HWMv2

Ports the m46x SoC configuration to hardware model version 2

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

soc/nuvoton/numaker/Kconfig

@@ -2,4 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-source "soc/soc_legacy/arm/nuvoton_numaker/*/Kconfig.series"
+config SOC_FAMILY_NUMAKER
+	select PLATFORM_SPECIFIC_INIT
+
+rsource "*/Kconfig"

soc/nuvoton/numaker/Kconfig.defconfig

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-source "soc/soc_legacy/arm/nuvoton_numaker/*/Kconfig.defconfig.series"
+rsource "*/Kconfig.defconfig"
 
 if SOC_FAMILY_NUMAKER
 

soc/nuvoton/numaker/Kconfig.soc

@@ -0,0 +1,11 @@
+# Copyright (c) 2023 Nuvoton Technology Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_FAMILY_NUMAKER
+	bool
+
+config SOC_FAMILY
+	default "numaker" if SOC_FAMILY_NUMAKER
+
+rsource "*/Kconfig.soc"

soc/nuvoton/numaker/m46x/CMakeLists.txt

@@ -4,4 +4,6 @@
 
 zephyr_sources(soc.c)
 
+zephyr_include_directories(.)
+
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

soc/nuvoton/numaker/m46x/Kconfig

@@ -3,13 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_M46X
-	bool "Nuvoton M46X Series MCU"
 	select ARM
 	select CPU_CORTEX_M4
 	select CPU_CORTEX_M_HAS_DWT
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
 	select CORTEX_M_SYSTICK if SYS_CLOCK_EXISTS
-	select SOC_FAMILY_NUMAKER
-	help
-	  Enable support for Nuvoton M46X MCU series
+
+config SOC_M467
+	select HAS_NUMAKER_HAL

soc/nuvoton/numaker/m46x/Kconfig.defconfig

@@ -4,9 +4,6 @@
 
 if SOC_SERIES_M46X
 
-source "soc/soc_legacy/arm/nuvoton_numaker/m46x/Kconfig.defconfig.m46*"
-
-config SOC_SERIES
-	default "m46x"
+rsource "Kconfig.defconfig.m46*"
 
 endif # SOC_SERIES_M46X

soc/nuvoton/numaker/m46x/Kconfig.soc

@@ -0,0 +1,19 @@
+# Copyright (c) 2023 Nuvoton Technology Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_M46X
+	bool
+	select SOC_FAMILY_NUMAKER
+	help
+	  Enable support for Nuvoton M46X MCU series
+
+config SOC_M467
+	bool
+	select SOC_SERIES_M46X
+
+config SOC_SERIES
+	default "m46x" if SOC_SERIES_M46X
+
+config SOC
+	default "m467" if SOC_M467

soc/nuvoton/numaker/soc.yml

@@ -0,0 +1,6 @@
+family:
+- name: numaker
+  series:
+  - name: m46x
+    socs:
+    - name: m467

soc/soc_legacy/arm/nuvoton_numaker/Kconfig

@@ -1,18 +0,0 @@
-# Copyright (c) 2023 Nuvoton Technology Corporation.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-
-config SOC_FAMILY_NUMAKER
-	select PLATFORM_SPECIFIC_INIT
-	bool
-
-if SOC_FAMILY_NUMAKER
-
-config SOC_FAMILY
-	string
-	default "nuvoton_numaker"
-
-source "soc/soc_legacy/arm/nuvoton_numaker/*/Kconfig.soc"
-
-endif # SOC_FAMILY_NUMAKER

soc/soc_legacy/arm/nuvoton_numaker/m46x/Kconfig.soc

@@ -1,13 +0,0 @@
-# Copyright (c) 2023 Nuvoton Technology Corporation.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-	prompt "Nuvoton M46X MCU Selection"
-	depends on SOC_SERIES_M46X
-
-config SOC_M467
-	bool "M467"
-	select HAS_NUMAKER_HAL
-
-endchoice