soc: use HWMv2 for arm mps3 SoC

tejlmand · tejlmand · commit e38983f19b59 · 2023-12-22T13:40:13.000+01:00
This commit move the arm mps3 SoC to soc/v2 and adopt HWMv2.

Signed-off-by: Torsten Rasmussen &lt;Torsten.Rasmussen@nordicsemi.no&gt;
diff --git a/soc/arm/arm/mps3/Kconfig.series b/soc/arm/arm/mps3/Kconfig.series
diff --git a/soc/v2/arm/mps3/CMakeLists.txt b/soc/v2/arm/mps3/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 "")
diff --git a/soc/v2/arm/mps3/Kconfig b/soc/v2/arm/mps3/Kconfig
@@ -1,12 +1,12 @@
 # Copyright (c) 2017-2021 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-choice
-	prompt "Arm MPS3 SoCs"
-	depends on SOC_SERIES_MPS3
+config SOC_SERIES_MPS3
+	select ARM
+	select SOC_FAMILY_ARM
+	select GPIO_MMIO32 if GPIO
 
 config SOC_MPS3_AN547
-	bool "Arm Cortex-M55 SSE-300 on MPS3 (AN547)"
 	select CPU_CORTEX_M55
 	select CPU_HAS_ARM_SAU
 	select CPU_HAS_ARM_MPU
@@ -16,8 +16,6 @@ config SOC_MPS3_AN547
 	select ARMV8_1_M_MVEF
 	select ARMV8_1_M_PMU
 
-endchoice
-
 config ARMV8_1_M_PMU_EVENTCNT
 	int
 	default 8 if SOC_MPS3_AN547
diff --git a/soc/v2/arm/mps3/Kconfig.defconfig b/soc/v2/arm/mps3/Kconfig.defconfig
@@ -3,12 +3,9 @@
 
 if SOC_SERIES_MPS3
 
-config SOC_SERIES
-	default "mps3"
-
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 25000000
 
-source "soc/arm/arm/mps3/Kconfig.defconfig.mps3*"
+rsource "Kconfig.defconfig.mps3*"
 
 endif # SOC_SERIES_MPS3
diff --git a/soc/v2/arm/mps3/Kconfig.defconfig.mps3_an547 b/soc/v2/arm/mps3/Kconfig.defconfig.mps3_an547
@@ -3,9 +3,6 @@
 
 if SOC_MPS3_AN547
 
-config SOC
-	default "mps3_an547"
-
 config NUM_IRQS
 	default 128
 
diff --git a/soc/v2/arm/mps3/Kconfig.soc b/soc/v2/arm/mps3/Kconfig.soc
@@ -0,0 +1,17 @@
+# Copyright (c) 2017-2021 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_MPS3
+	bool
+	help
+	  Enable support for ARM MPS3 MCU Series
+
+config SOC_SERIES
+	default "mps3" if SOC_SERIES_MPS3
+
+config SOC_MPS3_AN547
+	bool
+	select SOC_SERIES_MPS3
+
+config SOC
+	default "mps3_an547" if SOC_MPS3_AN547
diff --git a/soc/v2/arm/mps3/soc.c b/soc/v2/arm/mps3/soc.c
diff --git a/soc/v2/arm/mps3/soc.h b/soc/v2/arm/mps3/soc.h
diff --git a/soc/v2/arm/mps3/soc.yml b/soc/v2/arm/mps3/soc.yml
@@ -0,0 +1,4 @@
+series:
+- name: mps3
+  socs:
+  - name: an547

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,6 @@ zephyr_sources(`
`5`	`5`	`soc.c`
`6`	`6`	`)`
`7`	`7`
	`8`	`+zephyr_include_directories(.)`
	`9`	`+`
`8`	`10`	`set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +series:
 +- name: mps3
 +  socs:
 +  - name: an547