soc: m48x: Port to HWMv2

Ports the m48x SoC configuration to hardware model version 2

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

soc/nuvoton/numicro/Kconfig

@@ -3,4 +3,7 @@
 # Copyright (c) 2020 Linumiz
 # Author: Saravanan Sekar <saravanan@linumiz.com>
 
-source "soc/soc_legacy/arm/nuvoton_numicro/*/Kconfig.defconfig.series"
+config SOC_FAMILY_NUMICRO
+	select PLATFORM_SPECIFIC_INIT
+
+rsource "*/Kconfig"

soc/nuvoton/numicro/Kconfig.defconfig

@@ -3,4 +3,4 @@
 # Copyright (c) 2020 Linumiz
 # Author: Saravanan Sekar <saravanan@linumiz.com>
 
-source "soc/soc_legacy/arm/nuvoton_numicro/*/Kconfig.series"
+rsource "*/Kconfig.defconfig"

soc/nuvoton/numicro/Kconfig.soc

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2020 Linumiz
+# Author: Saravanan Sekar <saravanan@linumiz.com>
+
+config SOC_FAMILY_NUMICRO
+	bool
+
+config SOC_FAMILY
+	default "numicro" if SOC_FAMILY_NUMICRO
+
+rsource "*/Kconfig.soc"

soc/nuvoton/numicro/m48x/CMakeLists.txt

@@ -5,4 +5,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/numicro/m48x/Kconfig

@@ -4,12 +4,11 @@
 # Author: Saravanan Sekar <saravanan@linumiz.com>
 
 config SOC_SERIES_M48X
-	bool "Nuvoton M48X Series MCU"
 	select ARM
 	select CPU_CORTEX_M4
 	select CPU_CORTEX_M_HAS_DWT
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
-	select SOC_FAMILY_NUMICRO
+
-	help
+config SOC_M487
-	  Enable support for NUVOTON M48X MCU series
+	select HAS_NUMICRO_HAL

soc/nuvoton/numicro/m48x/Kconfig.defconfig

@@ -5,9 +5,6 @@
 
 if SOC_SERIES_M48X
 
-source "soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.defconfig.m48*"
+rsource "Kconfig.defconfig.m48*"
-
-config SOC_SERIES
-	default "m48x"
 
 endif # SOC_SERIES_M48X

soc/nuvoton/numicro/m48x/Kconfig.soc

@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2020 Linumiz
+# Author: Saravanan Sekar <saravanan@linumiz.com>
+
+config SOC_SERIES_M48X
+	bool
+	select SOC_FAMILY_NUMICRO
+	help
+	  Enable support for NUVOTON M48X MCU series
+
+config SOC_M487
+	bool
+	select SOC_SERIES_M48X
+
+config SOC_SERIES
+	default "m48x" if SOC_SERIES_M48X
+
+config SOC
+	default "m487" if SOC_M487

soc/nuvoton/numicro/soc.yml

@@ -0,0 +1,6 @@
+family:
+- name: numicro
+  series:
+  - name: m48x
+    socs:
+    - name: m487

soc/soc_legacy/arm/nuvoton_numicro/Kconfig

@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2020 Linumiz
-# Author: Saravanan Sekar <saravanan@linumiz.com>
-
-config SOC_FAMILY_NUMICRO
-	select PLATFORM_SPECIFIC_INIT
-	bool
-
-if SOC_FAMILY_NUMICRO
-config SOC_FAMILY
-	string
-	default "nuvoton_numicro"
-
-source "soc/soc_legacy/arm/nuvoton_numicro/*/Kconfig.soc"
-
-endif # SOC_FAMILY_NUMICRO

soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.soc

@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2020 Linumiz
-# Author: Saravanan Sekar <saravanan@linumiz.com>
-
-choice
-	prompt "NUVOTON M48X MCU Selection"
-	depends on SOC_SERIES_M48X
-
-config SOC_M487
-	bool "M487"
-	select HAS_NUMICRO_HAL
-
-endchoice