soc: arm: gigadevice: gd32f403: simplify soc selection

gmarull · gmarull · commit d6db6ba1472e · 2021-11-14T18:33:03.000+01:00
There is no need to specify SoC suffixes, so simplify the selection.

Signed-off-by: Gerard Marull-Paretas &lt;gerard@teslabs.com&gt;
diff --git a/boards/arm/gd32f403z_eval/Kconfig.board b/boards/arm/gd32f403z_eval/Kconfig.board
@@ -3,4 +3,4 @@
 
 config BOARD_GD32F403Z_EVAL
 	bool "GigaDevice GD32F403Z Evaluation Kit"
-	depends on SOC_GD32F403Z
+	depends on SOC_GD32F403
diff --git a/boards/arm/gd32f403z_eval/gd32f403z_eval_defconfig b/boards/arm/gd32f403z_eval/gd32f403z_eval_defconfig
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_SOC_SERIES_GD32F403=y
-CONFIG_SOC_GD32F403Z=y
+CONFIG_SOC_GD32F403=y
 CONFIG_BOARD_GD32F403Z_EVAL=y
 
 CONFIG_ARM_MPU=y
diff --git a/soc/arm/gigadevice/gd32f403/Kconfig.defconfig.gd32f403 b/soc/arm/gigadevice/gd32f403/Kconfig.defconfig.gd32f403
@@ -1,17 +1,11 @@
 # Copyright (c) 2021, ATL Electronics
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_GD32F403R || SOC_GD32F403V || SOC_GD32F403Z
-
 config SOC
-	default	"gd32f403r" if SOC_GD32F403R
-	default	"gd32f403v" if SOC_GD32F403V
-	default	"gd32f403z" if SOC_GD32F403Z
+	default "gd32f403"
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 168000000
 
 config NUM_IRQS
 	default 68
-
-endif
diff --git a/soc/arm/gigadevice/gd32f403/Kconfig.soc b/soc/arm/gigadevice/gd32f403/Kconfig.soc
@@ -5,13 +5,7 @@ choice
 	prompt "GigaDevice GD32F403 MCU Selection"
 	depends on SOC_SERIES_GD32F403
 
-	config SOC_GD32F403R
-		bool "gd32f403r"
-
-	config SOC_GD32F403V
-		bool "gd32f403v"
-
-	config SOC_GD32F403Z
-		bool "gd32f403z"
+	config SOC_GD32F403
+		bool "gd32f403"
 
 endchoice
