diff --git a/configs/stm32f4discovery/include/board.h b/configs/stm32f4discovery/include/board.h
index 6795ab52eec..ba481d61916 100644
--- a/configs/stm32f4discovery/include/board.h
+++ b/configs/stm32f4discovery/include/board.h
@@ -226,8 +226,8 @@
  */
 
 #ifdef CONFIG_STM32F4DISBB
-#  define GPIO_USART6_RX GPIO_USART6_RX_1 
-#  define GPIO_USART6_TX GPIO_USART6_TX_1 
+#  define GPIO_USART6_RX GPIO_USART6_RX_1
+#  define GPIO_USART6_TX GPIO_USART6_TX_1
 #endif
 
 /* PWM
@@ -254,7 +254,6 @@
 
 /* Ethernet *************************************************************************/
 
-
 #if defined(CONFIG_STM32F4DISBB) && defined(CONFIG_STM32_ETHMAC)
   /* RMII interface to the LAN8720 PHY */
 
@@ -270,10 +269,10 @@
 
   /* Pin disambiguation */
 
-#  define GPIO_ETH_RMII_TX_EN GPIO_ETH_RMII_TX_EN_1 
-#  define GPIO_ETH_RMII_TXD0  GPIO_ETH_RMII_TXD0_1 
-#  define GPIO_ETH_RMII_TXD1  GPIO_ETH_RMII_TXD1_1 
-#  define GPIO_ETH_PPS_OUT    GPIO_ETH_PPS_OUT_1 
+#  define GPIO_ETH_RMII_TX_EN GPIO_ETH_RMII_TX_EN_1
+#  define GPIO_ETH_RMII_TXD0  GPIO_ETH_RMII_TXD0_1
+#  define GPIO_ETH_RMII_TXD1  GPIO_ETH_RMII_TXD1_1
+#  define GPIO_ETH_PPS_OUT    GPIO_ETH_PPS_OUT_1
 
 #endif
 
diff --git a/configs/stm32f4discovery/src/stm32_nsh.c b/configs/stm32f4discovery/src/stm32_nsh.c
index b727c9f3f75..296615da8b7 100644
--- a/configs/stm32f4discovery/src/stm32_nsh.c
+++ b/configs/stm32f4discovery/src/stm32_nsh.c
@@ -44,11 +44,6 @@
 #include <debug.h>
 #include <errno.h>
 
-#ifdef CONFIG_STM32_SDIO
-#  include <nuttx/sdio.h>
-#  include <nuttx/mmcsd.h>
-#endif
-
 #ifdef CONFIG_SYSTEM_USBMONITOR
 #  include <apps/usbmonitor.h>
 #endif
diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h
index 824a3188467..dc0a17b6ac2 100644
--- a/configs/stm32f4discovery/src/stm32f4discovery.h
+++ b/configs/stm32f4discovery/src/stm32f4discovery.h
@@ -144,6 +144,25 @@
 #  define GPIO_OLED_DC    GPIO_OLED_A0
 #endif
 
+/* STM32F4DIS-BB MicroSD
+ *
+ * ---------- ------------- ------------------------------
+ * PIO        SIGNAL        Comments
+ * ---------- ------------- ------------------------------
+ * PB15       NCD           Pulled up externally
+ * PC9        DAT1          Configured by driver
+ * PC8        DAT0          "        " "" "    "
+ * PC12       CLK           "        " "" "    "
+ * PD2        CMD           "        " "" "    "
+ * PC11       CD/DAT3       "        " "" "    "
+ * PC10       DAT2          "        " "" "    "
+ * ---------- ------------- ------------------------------
+ */
+
+#if defined(CONFIG_STM32F4DISBB) && defined(CONFIG_STM32_SDIO)
+#  define GPIO_SDIO_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTB|GPIO_PIN15)
+#endif
+
 /****************************************************************************************************
  * Public Types
  ****************************************************************************************************/
@@ -300,4 +319,3 @@ int nsh_archinitialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H */
-