diff --git a/arch/arm/src/stm32h7/Kconfig b/arch/arm/src/stm32h7/Kconfig
index 382e6429f2..9287b0b242 100644
--- a/arch/arm/src/stm32h7/Kconfig
+++ b/arch/arm/src/stm32h7/Kconfig
@@ -17,8 +17,6 @@ config ARCH_CHIP_STM32H743AG
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_G
 	select STM32H7_IO_CONFIG_A
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 1024 Kb FLASH, 1024K Kb SRAM,
 		UFBGA169
@@ -37,8 +35,6 @@ config ARCH_CHIP_STM32H743BG
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_G
 	select STM32H7_IO_CONFIG_B
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 1024 Kb FLASH, 1024K Kb SRAM,
 		LQFP208
@@ -48,8 +44,6 @@ config ARCH_CHIP_STM32H743BI
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_B
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 2048 Kb FLASH, 1024K Kb SRAM,
 		LQFP208
@@ -59,8 +53,6 @@ config ARCH_CHIP_STM32H743IG
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_G
 	select STM32H7_IO_CONFIG_I
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 1024 Kb FLASH, 1024K Kb SRAM,
 		LQFP176 or UFBGA176
@@ -70,8 +62,6 @@ config ARCH_CHIP_STM32H743II
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_I
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 2048 Kb FLASH, 1024K Kb SRAM,
 		LQFP176 or UFBGA176
@@ -81,8 +71,6 @@ config ARCH_CHIP_STM32H743VG
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_G
 	select STM32H7_IO_CONFIG_V
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 1024 Kb FLASH, 1024K Kb SRAM,
 		LQFP100 or TFBGA100
@@ -92,8 +80,6 @@ config ARCH_CHIP_STM32H743VI
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_V
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 2048 Kb FLASH, 1024K Kb SRAM,
 		LQFP100 or TFBGA100
@@ -103,8 +89,6 @@ config ARCH_CHIP_STM32H743XG
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_G
 	select STM32H7_IO_CONFIG_X
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 1024 Kb FLASH, 1024K Kb SRAM,
 		TFBGA240
@@ -114,8 +98,6 @@ config ARCH_CHIP_STM32H743XI
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_X
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 2048 Kb FLASH, 1024K Kb SRAM,
 		TFBGA240
@@ -125,8 +107,6 @@ config ARCH_CHIP_STM32H743ZG
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_G
 	select STM32H7_IO_CONFIG_Z
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 1024 Kb FLASH, 1024K Kb SRAM,
 		LQFP144
@@ -136,8 +116,6 @@ config ARCH_CHIP_STM32H743ZI
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_Z
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 2048 Kb FLASH, 1024K Kb SRAM,
 		LQFP144
@@ -219,8 +197,6 @@ config ARCH_CHIP_STM32H747XI
 	select STM32H7_STM32H7X7XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_X
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	select STM32H7_HAVE_SMPS
 	---help---
 		Dual core STM32 H7 Cortex M7+M4, 2048 Kb FLASH, 1024K Kb SRAM
@@ -231,8 +207,6 @@ config ARCH_CHIP_STM32H753AI
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_A
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 2048 Kb FLASH, 1024K Kb SRAM,
 		with cryptographic accelerator, UFBGA169
@@ -251,8 +225,6 @@ config ARCH_CHIP_STM32H753II
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_I
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 2048 Kb FLASH, 1024K Kb SRAM,
 		with cryptographic accelerator, LQFP176/UFBGA176
@@ -262,8 +234,6 @@ config ARCH_CHIP_STM32H753VI
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_V
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 2048 Kb FLASH, 1024K Kb SRAM,
 		with cryptographic accelerator, LQFP100/TFBGA100
@@ -282,8 +252,6 @@ config ARCH_CHIP_STM32H753ZI
 	select STM32H7_STM32H7X3XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_Z
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	---help---
 		STM32 H7 Cortex M7, 2048 Kb FLASH, 1024K Kb SRAM,
 		with cryptographic accelerator, LQFP144
@@ -293,8 +261,6 @@ config ARCH_CHIP_STM32H7B3LI
 	select STM32H7_STM32H7B3XX
 	select STM32H7_FLASH_CONFIG_I
 	select STM32H7_IO_CONFIG_L
-	select STM32H7_HAVE_FDCAN1
-	select STM32H7_HAVE_FDCAN2
 	select STM32H7_HAVE_SMPS
 	---help---
 		STM32 H7 Cortex M7, 2048 Kb FLASH, 1376 Kb SRAM,
@@ -846,17 +812,20 @@ config STM32H7_WWDG
 	default n
 	select WATCHDOG
 
+
+menu "STM32H7 FDCAN Selection"
+
 config STM32H7_FDCAN1
 	bool "FDCAN1"
-	select STM32H7_FDCAN
 	default n
-	depends on STM32H7_HAVE_FDCAN1
+	select STM32H7_FDCAN
 
 config STM32H7_FDCAN2
 	bool "FDCAN2"
-	select STM32H7_FDCAN
 	default n
-	depends on STM32H7_HAVE_FDCAN2
+	select STM32H7_FDCAN
+
+endmenu # STM32H7 FDCAN Selection
 
 menu "STM32H7 I2C Selection"