diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index 70c62e7bdb2..714a87ce0e2 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -444,54 +444,63 @@ config ARCH_CHIP_STM32F405RG
 	bool "STM32F405RG"
 	select ARCH_CORTEXM4
 	select STM32_STM32F40XX
+	select STM32_STM32F405
 	select ARCH_HAVE_FPU
 
 config ARCH_CHIP_STM32F405VG
 	bool "STM32F405VG"
 	select ARCH_CORTEXM4
 	select STM32_STM32F40XX
+	select STM32_STM32F405
 	select ARCH_HAVE_FPU
 
 config ARCH_CHIP_STM32F405ZG
 	bool "STM32F405ZG"
 	select ARCH_CORTEXM4
 	select STM32_STM32F40XX
+	select STM32_STM32F405
 	select ARCH_HAVE_FPU
 
 config ARCH_CHIP_STM32F407VE
 	bool "STM32F407VE"
 	select ARCH_CORTEXM4
 	select STM32_STM32F40XX
+	select STM32_STM32F407
 	select ARCH_HAVE_FPU
 
 config ARCH_CHIP_STM32F407VG
 	bool "STM32F407VG"
 	select ARCH_CORTEXM4
 	select STM32_STM32F40XX
+	select STM32_STM32F407
 	select ARCH_HAVE_FPU
 
 config ARCH_CHIP_STM32F407ZE
 	bool "STM32F407ZE"
 	select ARCH_CORTEXM4
 	select STM32_STM32F40XX
+	select STM32_STM32F407
 	select ARCH_HAVE_FPU
 
 config ARCH_CHIP_STM32F407ZG
 	bool "STM32F407ZG"
 	select ARCH_CORTEXM4
 	select STM32_STM32F40XX
+	select STM32_STM32F407
 	select ARCH_HAVE_FPU
 
 config ARCH_CHIP_STM32F407IE
 	bool "STM32F407IE"
 	select ARCH_CORTEXM4
 	select STM32_STM32F40XX
+	select STM32_STM32F407
 	select ARCH_HAVE_FPU
 
 config ARCH_CHIP_STM32F407IG
 	bool "STM32F407IG"
 	select ARCH_CORTEXM4
 	select STM32_STM32F40XX
+	select STM32_STM32F407
 	select ARCH_HAVE_FPU
 
 config ARCH_CHIP_STM32F427V
@@ -582,6 +591,7 @@ config STM32_PERFORMANCELINE
 config STM32_HIGHDENSITY
 	bool
 	default n
+	select STM32_HAVE_FSMC
 
 config STM32_MEDIUMDENSITY
 	bool
@@ -595,6 +605,7 @@ config STM32_STM32F20XX
 	bool
 	default n
 	select STM32_HAVE_OTGFS
+	select STM32_HAVE_FSMC
 
 config STM32_STM32F30XX
 	bool
@@ -608,14 +619,29 @@ config STM32_STM32F40XX
 
 config STM32_STM32F401
 	bool
+	default n
+
+config STM32_STM32F405
+	bool
+	default n
+	select STM32_HAVE_FSMC
+
+config STM32_STM32F407
+	bool
+	default n
+	select STM32_HAVE_FSMC
 
 # This is really 427/437, but we treat the two the same.
 config STM32_STM32F427
 	bool
+	default n
+	select STM32_HAVE_FSMC
 
 # This is really 429/439, but we treat the two the same.
 config STM32_STM32F429
 	bool
+	default n
+	select STM32_HAVE_FSMC
 
 config STM32_DFU
 	bool "DFU bootloader"
@@ -635,6 +661,10 @@ config STM32_HAVE_OTGFS
 	bool
 	default n
 
+config STM32_HAVE_FSMC
+	bool
+	default n
+
 config STM32_ADC1
 	bool "ADC1"
 	default n
@@ -742,7 +772,7 @@ config STM32_ETHMAC
 config STM32_FSMC
 	bool "FSMC"
 	default n
-	depends on !STM32_CONNECTIVITYLINE && (STM32_HIGHDENSITY || STM32_STM32F20XX || STM32_STM32F40XX)
+	depends on STM32_HAVE_FSMC
 
 config STM32_HASH
 	bool "HASH"
diff --git a/configs/nucleo-f401re/nsh/defconfig b/configs/nucleo-f401re/nsh/defconfig
index 4c7ea20dccd..7e122b6abe8 100644
--- a/configs/nucleo-f401re/nsh/defconfig
+++ b/configs/nucleo-f401re/nsh/defconfig
@@ -12,10 +12,6 @@ CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
 # CONFIG_HOST_OTHER is not set
-# CONFIG_WINDOWS_NATIVE is not set
-# CONFIG_WINDOWS_CYGWIN is not set
-# CONFIG_WINDOWS_MSYS is not set
-# CONFIG_WINDOWS_OTHER is not set
 
 #
 # Build Configuration
@@ -113,16 +109,10 @@ CONFIG_ARCH_HAVE_MPU=y
 #
 # ARMV7M Configuration Options
 #
-# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
 CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
-# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
-# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
 # CONFIG_SERIAL_TERMIOS is not set
 CONFIG_SDIO_DMA=y
 CONFIG_SDIO_DMAPRIO=0x00010000
@@ -222,6 +212,10 @@ CONFIG_ARCH_CHIP_STM32F401RE=y
 # CONFIG_STM32_STM32F30XX is not set
 CONFIG_STM32_STM32F40XX=y
 CONFIG_STM32_STM32F401=y
+# CONFIG_STM32_STM32F405 is not set
+# CONFIG_STM32_STM32F407 is not set
+# CONFIG_STM32_STM32F427 is not set
+# CONFIG_STM32_STM32F429 is not set
 # CONFIG_STM32_DFU is not set
 
 #
@@ -229,6 +223,7 @@ CONFIG_STM32_STM32F401=y
 #
 # CONFIG_STM32_HAVE_USBDEV is not set
 CONFIG_STM32_HAVE_OTGFS=y
+# CONFIG_STM32_HAVE_FSMC is not set
 # CONFIG_STM32_ADC1 is not set
 # CONFIG_STM32_ADC2 is not set
 # CONFIG_STM32_ADC3 is not set
@@ -244,7 +239,6 @@ CONFIG_STM32_DMA2=y
 # CONFIG_STM32_DAC2 is not set
 # CONFIG_STM32_DCMI is not set
 # CONFIG_STM32_ETHMAC is not set
-# CONFIG_STM32_FSMC is not set
 # CONFIG_STM32_HASH is not set
 # CONFIG_STM32_I2C1 is not set
 # CONFIG_STM32_I2C2 is not set
@@ -336,6 +330,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
 CONFIG_ARCH_IRQPRIO=y
 # CONFIG_ARCH_STACKDUMP is not set
 # CONFIG_ENDIAN_BIG is not set