diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index ae2bf31307..06603bf8c1 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -2,3 +2,71 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+choice
+	prompt "STM32 Chip Selection"
+	default ARCH_CHIP_STM32F103ZET6
+	depends on ARCH_CHIP_STM32
+
+config ARCH_CHIP_STM32F103ZET6
+	bool "STM32F103ZET6"
+
+config ARCH_CHIP_STM32F103RET6
+	bool "STM32F103RET6"
+
+config ARCH_CHIP_STM32F103VCT6
+	bool "STM32F103VCT6"
+
+config ARCH_CHIP_STM32F105VBT7
+	bool "STM32F105VBT7"
+
+config ARCH_CHIP_STM32F107VC
+	bool "STM32F107VC"
+
+config ARCH_CHIP_STM32F207IG
+	bool "STM32F207IG"
+
+config ARCH_CHIP_STM32F405RG
+	bool "STM32F405RG"
+
+config ARCH_CHIP_STM32F405VG
+	bool "STM32F405VG"
+
+config ARCH_CHIP_STM32F405ZG
+	bool "STM32F405ZG"
+
+config ARCH_CHIP_STM32F407VE
+	bool "STM32F407VE"
+
+config ARCH_CHIP_STM32F407VG
+	bool "STM32F407VG"
+
+config ARCH_CHIP_STM32F407ZE
+	bool "STM32F407ZE"
+
+config ARCH_CHIP_STM32F407ZG
+	bool "STM32F407ZG"
+
+config ARCH_CHIP_STM32F407IE
+	bool "STM32F407IE"
+
+config ARCH_CHIP_STM32F407IE
+	bool "STM32F407IE"
+
+endchoice
+
+config STM32_STM32F10XX
+	bool
+	default y if ARCH_CHIP_STM32F103ZET6 || ARCH_CHIP_STM32F103RET6 || ARCH_CHIP_STM32F103VCT6 || ARCH_CHIP_STM32F105VBT7 || ARCH_CHIP_STM32F107VC
+
+config STM32_CONNECTIVITYLINE
+	bool
+	default y if ARCH_CHIP_STM32F105VBT7 || ARCH_CHIP_STM32F107VC
+
+config STM32_STM32F20XX
+	bool
+	default y if ARCH_CHIP_STM32F207IG
+
+config STM32_STM32F40XX
+	bool
+	default y if ARCH_CHIP_STM32F405RG || ARCH_CHIP_STM32F405VG || ARCH_CHIP_STM32F405ZG || ARCH_CHIP_STM32F407VE || ARCH_CHIP_STM32F407VG || ARCH_CHIP_STM32F407ZE || ARCH_CHIP_STM32F407ZG || ARCH_CHIP_STM32F407IE || ARCH_CHIP_STM32F407IE
diff --git a/arch/arm/src/stm32/stm32_wdg.h b/arch/arm/src/stm32/stm32_wdg.h
index ef9a0cb514..38af388f92 100644
--- a/arch/arm/src/stm32/stm32_wdg.h
+++ b/arch/arm/src/stm32/stm32_wdg.h
@@ -45,6 +45,8 @@
 #include "chip.h"
 #include "chip/stm32_wdg.h"
 
+#ifdef CONFIG_WATCHDOG
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -81,7 +83,9 @@ extern "C" {
  *
  ****************************************************************************/
 
+#ifdef CONFIG_STM32_IWDG
 EXTERN void stm32_iwdginitialize(FAR const char *devpath, uint32_t lsifreq);
+#endif
 
 /****************************************************************************
  * Name: stm32_wwdginitialize
@@ -100,7 +104,9 @@ EXTERN void stm32_iwdginitialize(FAR const char *devpath, uint32_t lsifreq);
  *
  ****************************************************************************/
 
+#ifdef CONFIG_STM32_WWDG
 EXTERN void stm32_wwdginitialize(FAR const char *devpath);
+#endif
 
 #undef EXTERN
 #if defined(__cplusplus)
@@ -108,4 +114,5 @@ EXTERN void stm32_wwdginitialize(FAR const char *devpath);
 #endif
 
 #endif /* __ASSEMBLY__ */
+#endif /* CONFIG_WATCHDOG */
 #endif /* __ARCH_ARM_SRC_STM32_STM32_WDG_H */