soc: ambiq: Port to HWMv2

Ports the SoC configuration to hardware model version 2

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

soc/ambiq/Kconfig

@@ -2,4 +2,8 @@
 #
 # Copyright (c) 2023 Antmicro <www.antmicro.com>
 
-source "soc/soc_legacy/arm/ambiq/*/Kconfig.series"
+if SOC_FAMILY_AMBIQ
+
+rsource "*/Kconfig"
+
+endif # SOC_FAMILY_AMBIQ

soc/ambiq/Kconfig.defconfig

@@ -2,10 +2,14 @@
 #
 # Copyright (c) 2023 Antmicro <www.antmicro.com>
 
-source "soc/soc_legacy/arm/ambiq/*/Kconfig.defconfig.series"
+if SOC_FAMILY_AMBIQ
+
+rsource "*/Kconfig.defconfig"
 
 config CORTEX_M_SYSTICK
 	default n if AMBIQ_STIMER_TIMER
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 32768 if AMBIQ_STIMER_TIMER
+
+endif # SOC_FAMILY_AMBIQ

soc/ambiq/Kconfig.soc

@@ -5,12 +5,7 @@
 config SOC_FAMILY_AMBIQ
 	bool
 
-if SOC_FAMILY_AMBIQ
-
 config SOC_FAMILY
-	string
-	default "ambiq"
+	default "ambiq" if SOC_FAMILY_AMBIQ
 
-source "soc/soc_legacy/arm/ambiq/*/Kconfig.soc"
-
-endif # SOC_FAMILY_AMBIQ
+rsource "*/Kconfig.soc"

soc/ambiq/apollo4x/CMakeLists.txt

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

soc/ambiq/apollo4x/Kconfig

@@ -1,18 +1,13 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright (c) 2023 Antmicro <www.antmicro.com>
-
-# Ambiq Apollo4 MCU Series
+# Copyright (c) 2023 Ambiq Micro Inc. <www.ambiq.com>
 
 config SOC_SERIES_APOLLO4X
-	bool "Apollo4 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_AMBIQ
 	select HAS_SWO
 	select AMBIQ_HAL
-	help
-	  Enable support for Apollo4 MCU series

soc/ambiq/apollo4x/Kconfig.defconfig

@@ -4,9 +4,6 @@
 
 if SOC_SERIES_APOLLO4X
 
-source "soc/soc_legacy/arm/ambiq/apollo4x/Kconfig.defconfig.apollo4*"
-
-config SOC_SERIES
-	default "apollo4x"
+rsource "Kconfig.defconfig.apollo4*"
 
 endif # SOC_SERIES_APOLLO4X

soc/ambiq/apollo4x/Kconfig.soc

@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2023 Antmicro <www.antmicro.com>
+# Copyright (c) 2023 Ambiq Micro Inc. <www.ambiq.com>
+
+config SOC_SERIES_APOLLO4X
+	bool
+	select SOC_FAMILY_AMBIQ
+	help
+	  Apollo4 Series MCU
+
+config SOC_APOLLO4P
+	bool
+	select SOC_SERIES_APOLLO4X
+	help
+	  Apollo4P
+
+config SOC_APOLLO4P_BLUE
+	bool
+	select SOC_SERIES_APOLLO4X
+	help
+	  Apollo4 Blue Plus
+
+config SOC_SERIES
+	default "apollo4x" if SOC_SERIES_APOLLO4X
+
+config SOC
+	default "apollo4p" if SOC_APOLLO4P
+	default "apollo4p_blue" if SOC_APOLLO4P_BLUE

soc/ambiq/soc.yml

@@ -0,0 +1,7 @@
+family:
+- name: ambiq
+  series:
+  - name: apollo4x
+    socs:
+    - name: apollo4p
+    - name: apollo4p_blue

soc/soc_legacy/arm/ambiq/apollo4x/Kconfig.soc

@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2023 Antmicro <www.antmicro.com>
-# Copyright (c) 2023 Ambiq Micro Inc. <www.ambiq.com>
-
-choice
-	prompt "Ambiq Apollo4X Selection"
-	depends on SOC_SERIES_APOLLO4X
-
-config SOC_APOLLO4P
-	bool "Apollo4P"
-
-config SOC_APOLLO4P_BLUE
-	bool "Apollo4 Blue Plus"
-
-endchoice