From 983ff8b0401c38b4e94a9a2dc48ec5dd059d3795 Mon Sep 17 00:00:00 2001
From: Francois Ramu <francois.ramu@st.com>
Date: Thu, 30 Sep 2021 11:17:26 +0200
Subject: [PATCH] soc: arm: stm32f4: group stm32f412xx in a Kconfig for the
 serie

A new stm32f412vx devices is introduced.
The soc devices stm32f412cx, stm32f412vx, stm32f412zx are
removed to have a more generic stm32f412xx Kconfig.
The stm32cube modules stm32f412cx/vx/zx exists.

Signed-off-by: Francois Ramu <francois.ramu@st.com>
---
 .../stm32f4/Kconfig.defconfig.stm32f412cg     | 14 --------
 .../stm32f4/Kconfig.defconfig.stm32f412xx     | 34 +++++++++++++++++++
 .../stm32f4/Kconfig.defconfig.stm32f412zg     | 14 --------
 soc/arm/st_stm32/stm32f4/Kconfig.soc          | 11 +++---
 4 files changed, 41 insertions(+), 32 deletions(-)
 delete mode 100644 soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412cg
 create mode 100644 soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412xx
 delete mode 100644 soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412zg

diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412cg b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412cg
deleted file mode 100644
index 17783e6dae3..00000000000
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412cg
+++ /dev/null
@@ -1,14 +0,0 @@
-# ST STM32F412CG MCU configuration options
-
-# Copyright (c) 2018, I-SENSE group of ICCS
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_STM32F412CG
-
-config SOC
-	default "stm32f412cx"
-
-config NUM_IRQS
-	default 97
-
-endif # SOC_STM32F412CG
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412xx
new file mode 100644
index 00000000000..f66b53c2296
--- /dev/null
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412xx
@@ -0,0 +1,34 @@
+# 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
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412zg b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412zg
deleted file mode 100644
index d8e22770c71..00000000000
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412zg
+++ /dev/null
@@ -1,14 +0,0 @@
-# ST STM32F412ZG MCU configuration options
-
-# Copyright (c) 2017 Florian Vaussard, HEIG-VD
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_STM32F412ZG
-
-config SOC
-	default "stm32f412zx"
-
-config NUM_IRQS
-	default 97
-
-endif # SOC_STM32F412ZG
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.soc b/soc/arm/st_stm32/stm32f4/Kconfig.soc
index 3c70c6eb944..b391983e7ad 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.soc
@@ -28,11 +28,14 @@ config SOC_STM32F410RX
 config SOC_STM32F411XE
 	bool "STM32F411XE"
 
-config SOC_STM32F412CG
-	bool "STM32F412CG"
+config SOC_STM32F412CX
+	bool "STM32F412CX"
 
-config SOC_STM32F412ZG
-	bool "STM32F412ZG"
+config SOC_STM32F412VX
+	bool "STM32F412VX"
+
+config SOC_STM32F412ZX
+	bool "STM32F412ZX"
 
 config SOC_STM32F413XX
 	bool "STM32F413XX"