soc: v2: stm32: Migrate STM32F4 series

Port STM32F4 series to HW model V2

Signed-off-by: Abderrahmane Jarmouni <abderrahmane.jarmouni-ext@st.com>

soc/soc_legacy/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f407xx

@@ -1,24 +0,0 @@
-# ST STM32F407XX MCU configuration options
-
-# Copyright (c) 2016 Linaro Limited.
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_STM32F407XE
-
-config SOC
-	default "stm32f407xx"
-
-config NUM_IRQS
-	default 82
-
-endif # SOC_STM32F407XE
-
-if SOC_STM32F407XG
-
-config SOC
-	default "stm32f407xx"
-
-config NUM_IRQS
-	default 82
-
-endif # SOC_STM32F407XG

soc/soc_legacy/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412xx

@@ -1,34 +0,0 @@
-# ST STM32F412XX MCU configuration options
-
-# Copyright (c) 2021 STMicroelectronics.
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_STM32F412CX
-
-config SOC
-	default "stm32f412cx"
-
-config NUM_IRQS
-	default 97
-
-endif # SOC_STM32F412CX
-
-if SOC_STM32F412VX
-
-config SOC
-	default "stm32f412vx"
-
-config NUM_IRQS
-	default 97
-
-endif # SOC_STM32F412VX
-
-if SOC_STM32F412ZX
-
-config SOC
-	default "stm32f412zx"
-
-config NUM_IRQS
-	default 97
-
-endif # SOC_STM32F412ZX

soc/soc_legacy/arm/st_stm32/stm32f4/Kconfig.soc

@@ -1,70 +0,0 @@
-# ST Microelectronics STM32F4 MCU line
-
-# Copyright (c) 2016 Linaro Limited.
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-	prompt "STM32F4x MCU Selection"
-	depends on SOC_SERIES_STM32F4X
-
-config SOC_STM32F401XC
-	bool "STM32F401XC"
-
-config SOC_STM32F401XE
-	bool "STM32F401XE"
-
-config SOC_STM32F405XG
-	bool "STM32F405XG"
-
-config SOC_STM32F407XE
-	bool "STM32F407XE"
-
-config SOC_STM32F407XG
-	bool "STM32F407XG"
-
-config SOC_STM32F410RX
-	bool "STM32F410RX"
-
-config SOC_STM32F411XE
-	bool "STM32F411XE"
-
-config SOC_STM32F412CX
-	bool "STM32F412CX"
-
-config SOC_STM32F412RX
-	bool "STM32F412RX"
-
-config SOC_STM32F412VX
-	bool "STM32F412VX"
-
-config SOC_STM32F412ZX
-	bool "STM32F412ZX"
-
-config SOC_STM32F413XX
-	bool "STM32F413XX"
-
-config SOC_STM32F415XX
-	bool "STM32F415XX"
-
-config SOC_STM32F417XX
-	bool "STM32F417XX"
-
-config SOC_STM32F423XX
-	bool "STM32F423XX"
-
-config SOC_STM32F427XX
-	bool "STM32F427XI"
-
-config SOC_STM32F429XX
-	bool "STM32F429XI"
-
-config SOC_STM32F437XX
-	bool "STM32F437XX"
-
-config SOC_STM32F446XX
-	bool "STM32F446XX"
-
-config SOC_STM32F469XX
-	bool "STM32F469XX"
-
-endchoice

soc/st/stm32/soc.yml

@@ -21,3 +21,24 @@ family:
     - name: stm32f103xe
     - name: stm32f105xc
     - name: stm32f107xc
+  - name: stm32f4x
+    socs:
+    - name: stm32f401xc
+    - name: stm32f401xe
+    - name: stm32f405xx
+    - name: stm32f407xx
+    - name: stm32f410rx
+    - name: stm32f411xe
+    - name: stm32f412cx
+    - name: stm32f412rx
+    - name: stm32f412vx
+    - name: stm32f412zx
+    - name: stm32f413xx
+    - name: stm32f415xx
+    - name: stm32f417xx
+    - name: stm32f423xx
+    - name: stm32f427xx
+    - name: stm32f429xx
+    - name: stm32f437xx
+    - name: stm32f446xx
+    - name: stm32f469xx

soc/st/stm32/stm32f4/CMakeLists.txt

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

soc/st/stm32/stm32f4/Kconfig

@@ -1,18 +1,14 @@
-# ST Microelectronics STM32F4 MCU series
+# STMicroelectronics STM32F4 MCU series
 
 # Copyright (c) 2016 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_STM32F4X
-	bool "STM32F4x Series MCU"
 	select ARM
 	select CPU_CORTEX_M4
 	select CPU_CORTEX_M_HAS_DWT
 	select CPU_HAS_FPU
-	select SOC_FAMILY_STM32
 	select HAS_STM32CUBE
 	select CPU_HAS_ARM_MPU
 	select HAS_SWO
 	select HAS_PM
-	help
-	  Enable support for STM32F4 MCU series

soc/st/stm32/stm32f4/Kconfig.defconfig

@@ -1,4 +1,4 @@
-# ST Microelectronics STM32F4 MCU line
+# STMicroelectronics STM32F4 MCU line
 
 # Copyright (c) 2016 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
@@ -7,10 +7,7 @@
 
 if SOC_SERIES_STM32F4X
 
-source "soc/soc_legacy/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f4*"
-
-config SOC_SERIES
-	default "stm32f4"
+rsource "Kconfig.defconfig.stm32f4*"
 
 # adjust the fallback because of the LSI oscaillator characteristics
 config TASK_WDT_HW_FALLBACK_DELAY

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f401xc

@@ -5,9 +5,6 @@
 
 if SOC_STM32F401XC
 
-config SOC
-	default	"stm32f401xc"
-
 config NUM_IRQS
 	default 85
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f401xe

@@ -5,9 +5,6 @@
 
 if SOC_STM32F401XE
 
-config SOC
-	default "stm32f401xe"
-
 config NUM_IRQS
 	default 85
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f405xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F405XG
 
-config SOC
-	default "stm32f405xx"
-
 config NUM_IRQS
 	default 82
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f407xx

@@ -0,0 +1,11 @@
+# ST STM32F407XX MCU configuration options
+
+# Copyright (c) 2016 Linaro Limited.
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_STM32F407XE || SOC_STM32F407XG
+
+config NUM_IRQS
+	default 82
+
+endif

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f410xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F410RX
 
-config SOC
-	default "stm32f410rx"
-
 config NUM_IRQS
 	default 97
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f411xe

@@ -5,9 +5,6 @@
 
 if SOC_STM32F411XE
 
-config SOC
-	default "stm32f411xe"
-
 config NUM_IRQS
 	default 86
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f412rx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F412RX
 
-config SOC
-	default "stm32f412rx"
-
 config NUM_IRQS
 	default 97
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f412xx

@@ -0,0 +1,11 @@
+# ST STM32F412XX MCU configuration options
+
+# Copyright (c) 2024 STMicroelectronics.
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_STM32F412CX || SOC_STM32F412VX || SOC_STM32F412ZX
+
+config NUM_IRQS
+	default 97
+
+endif

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f413xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F413XX
 
-config SOC
-	default "stm32f413xx"
-
 config NUM_IRQS
 	default 102
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f415xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F415XX
 
-config SOC
-	default "stm32f415xx"
-
 config NUM_IRQS
 	default 82
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f417xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F417XX
 
-config SOC
-	default "stm32f417xx"
-
 config NUM_IRQS
 	default 82
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f423xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F423XX
 
-config SOC
-	default "stm32f423xx"
-
 config NUM_IRQS
 	default 102
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f427xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F427XX
 
-config SOC
-	default "stm32f427xx"
-
 config NUM_IRQS
 	default 91
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f429xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F429XX
 
-config SOC
-	default "stm32f429xx"
-
 config NUM_IRQS
 	default 91
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f437xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F437XX
 
-config SOC
-	default "stm32f437xx"
-
 config NUM_IRQS
 	default 91
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f446xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F446XX
 
-config SOC
-	default "stm32f446xx"
-
 config NUM_IRQS
 	default 97
 

soc/st/stm32/stm32f4/Kconfig.defconfig.stm32f469xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32F469XX
 
-config SOC
-	default "stm32f469xx"
-
 config NUM_IRQS
 	default 93
 

soc/st/stm32/stm32f4/Kconfig.soc

@@ -0,0 +1,113 @@
+# STMicroelectronics STM32F4 MCU line
+
+# Copyright (c) 2016 Linaro Limited.
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_STM32F4X
+	bool
+	select SOC_FAMILY_STM32
+
+config SOC_SERIES
+	default "stm32f4" if SOC_SERIES_STM32F4X
+
+config SOC_STM32F401XC
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F401XE
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F405XG
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F407XE
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F407XG
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F410RX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F411XE
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F412CX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F412RX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F412VX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F412ZX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F413XX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F415XX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F417XX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F423XX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F427XX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F429XX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F437XX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F446XX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC_STM32F469XX
+	bool
+	select SOC_SERIES_STM32F4X
+
+config SOC
+	default "stm32f401xc" if SOC_STM32F401XC
+	default "stm32f401xe" if SOC_STM32F401XE
+	default "stm32f405xx" if SOC_STM32F405XG
+	default "stm32f407xx" if SOC_STM32F407XE
+	default "stm32f407xx" if SOC_STM32F407XG
+	default "stm32f410rx" if SOC_STM32F410RX
+	default "stm32f411xe" if SOC_STM32F411XE
+	default "stm32f412cx" if SOC_STM32F412CX
+	default "stm32f412rx" if SOC_STM32F412RX
+	default "stm32f412vx" if SOC_STM32F412VX
+	default "stm32f412zx" if SOC_STM32F412ZX
+	default "stm32f413xx" if SOC_STM32F413XX
+	default "stm32f415xx" if SOC_STM32F415XX
+	default "stm32f417xx" if SOC_STM32F417XX
+	default "stm32f423xx" if SOC_STM32F423XX
+	default "stm32f427xx" if SOC_STM32F427XX
+	default "stm32f429xx" if SOC_STM32F429XX
+	default "stm32f437xx" if SOC_STM32F437XX
+	default "stm32f446xx" if SOC_STM32F446XX
+	default "stm32f469xx" if SOC_STM32F469XX