diff --git a/configs/stm32butterfly2/nsh/defconfig b/configs/stm32butterfly2/nsh/defconfig
index 91c9c3ccc4..ba6490f6a0 100644
--- a/configs/stm32butterfly2/nsh/defconfig
+++ b/configs/stm32butterfly2/nsh/defconfig
@@ -148,6 +148,9 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARMV7M_STACKCHECK is not set
 # CONFIG_ARMV7M_ITMSYSLOG is not set
 # CONFIG_SERIAL_TERMIOS is not set
+# CONFIG_USBHOST_BULK_DISABLE is not set
+# CONFIG_USBHOST_INT_DISABLE is not set
+# CONFIG_USBHOST_ISOC_DISABLE is not set
 
 #
 # STM32 Configuration Options
@@ -365,7 +368,7 @@ CONFIG_STM32_HAVE_SPI3=y
 # CONFIG_STM32_HAVE_SPI6 is not set
 # CONFIG_STM32_HAVE_SAIPLL is not set
 # CONFIG_STM32_HAVE_I2SPLL is not set
-# CONFIG_STM32_ADC1 is not set
+CONFIG_STM32_ADC1=y
 # CONFIG_STM32_ADC2 is not set
 # CONFIG_STM32_BKP is not set
 # CONFIG_STM32_CAN1 is not set
@@ -377,11 +380,12 @@ CONFIG_STM32_HAVE_SPI3=y
 # CONFIG_STM32_DAC2 is not set
 # CONFIG_STM32_ETHMAC is not set
 # CONFIG_STM32_I2C1 is not set
-# CONFIG_STM32_OTGFS is not set
+CONFIG_STM32_OTGFS=y
 CONFIG_STM32_PWR=y
-# CONFIG_STM32_SPI1 is not set
+CONFIG_STM32_SPI1=y
 # CONFIG_STM32_SPI2 is not set
 # CONFIG_STM32_SPI3 is not set
+CONFIG_STM32_SYSCFG=y
 # CONFIG_STM32_TIM1 is not set
 # CONFIG_STM32_TIM2 is not set
 # CONFIG_STM32_TIM3 is not set
@@ -396,11 +400,14 @@ CONFIG_STM32_USART2=y
 # CONFIG_STM32_UART5 is not set
 # CONFIG_STM32_IWDG is not set
 # CONFIG_STM32_WWDG is not set
+CONFIG_STM32_ADC=y
+CONFIG_STM32_SPI=y
 # CONFIG_STM32_NOEXT_VECTORS is not set
 
 #
 # Alternate Pin Mapping
 #
+# CONFIG_STM32_SPI1_REMAP is not set
 CONFIG_STM32_USART2_REMAP=y
 # CONFIG_STM32_JTAG_DISABLE is not set
 CONFIG_STM32_JTAG_FULL_ENABLE=y
@@ -409,6 +416,7 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+# CONFIG_STM32_CCM_PROCFS is not set
 
 #
 # Timer Configuration
@@ -419,6 +427,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
 # CONFIG_STM32_TIM5_CAP is not set
+
+#
+# ADC Configuration
+#
 CONFIG_STM32_USART=y
 CONFIG_STM32_SERIALDRIVER=y
 
@@ -440,12 +452,25 @@ CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
 # CONFIG_STM32_USART_SINGLEWIRE is not set
+
+#
+# SPI Configuration
+#
+# CONFIG_STM32_SPI_INTERRUPTS is not set
+# CONFIG_STM32_SPI_DMA is not set
 CONFIG_STM32_HAVE_RTC_COUNTER=y
 # CONFIG_STM32_HAVE_RTC_SUBSECONDS is not set
+# CONFIG_STM32_MII_MCO is not set
+# CONFIG_STM32_MII_EXTCLK is not set
 
 #
 # USB FS Host Configuration
 #
+CONFIG_STM32_OTGFS_RXFIFO_SIZE=128
+CONFIG_STM32_OTGFS_NPTXFIFO_SIZE=96
+CONFIG_STM32_OTGFS_PTXFIFO_SIZE=128
+CONFIG_STM32_OTGFS_DESCSIZE=128
+# CONFIG_STM32_OTGFS_SOFINTR is not set
 
 #
 # USB HS Host Configuration
@@ -534,13 +559,20 @@ CONFIG_ARCH_BOARD="stm32butterfly2"
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_HAVE_BUTTONS=y
-# CONFIG_ARCH_BUTTONS is not set
+CONFIG_ARCH_BUTTONS=y
 
 #
 # Board-Specific Options
 #
 # CONFIG_BOARD_CRASHDUMP is not set
-# CONFIG_LIB_BOARDCTL is not set
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+CONFIG_BOARDCTL_ADCTEST=y
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -554,7 +586,7 @@ CONFIG_ARCH_HAVE_TICKLESS=y
 # CONFIG_SCHED_TICKLESS is not set
 CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
-# CONFIG_CLOCK_MONOTONIC is not set
+CONFIG_CLOCK_MONOTONIC=y
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=1970
 CONFIG_START_MONTH=0
@@ -669,7 +701,16 @@ CONFIG_RAMDISK=y
 # CONFIG_PWM is not set
 CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_I2C is not set
-# CONFIG_SPI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_EXCHANGE=y
+# CONFIG_SPI_CMDDATA is not set
+CONFIG_SPI_CALLBACK=y
+# CONFIG_SPI_BITBANG is not set
+CONFIG_SPI_HWFEATURES=y
+# CONFIG_SPI_CRCGENERATION is not set
+CONFIG_SPI_CS_CONTROL=y
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -678,7 +719,14 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_ANALOG is not set
+CONFIG_ANALOG=y
+CONFIG_ADC=y
+CONFIG_ADC_FIFOSIZE=8
+# CONFIG_ADC_NO_STARTUP_CONV is not set
+# CONFIG_ADC_ADS1242 is not set
+# CONFIG_ADC_ADS125X is not set
+# CONFIG_ADC_PGA11X is not set
+# CONFIG_DAC is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
@@ -703,10 +751,34 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
 # CONFIG_NCP5623C is not set
-# CONFIG_MMCSD is not set
+CONFIG_MMCSD=y
+CONFIG_MMCSD_NSLOTS=1
+# CONFIG_MMCSD_READONLY is not set
+# CONFIG_MMCSD_MULTIBLOCK_DISABLE is not set
+# CONFIG_MMCSD_MMCSUPPORT is not set
+CONFIG_MMCSD_HAVECARDDETECT=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SPICLOCK=20000000
+CONFIG_MMCSD_SPIMODE=0
+# CONFIG_ARCH_HAVE_SDIO is not set
+# CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
+# CONFIG_ETH0_PHY_NONE is not set
+# CONFIG_ETH0_PHY_AM79C874 is not set
+# CONFIG_ETH0_PHY_KS8721 is not set
+# CONFIG_ETH0_PHY_KSZ8041 is not set
+# CONFIG_ETH0_PHY_KSZ8051 is not set
+# CONFIG_ETH0_PHY_KSZ8061 is not set
+# CONFIG_ETH0_PHY_KSZ8081 is not set
+# CONFIG_ETH0_PHY_KSZ90x1 is not set
+# CONFIG_ETH0_PHY_DP83848C is not set
+# CONFIG_ETH0_PHY_LAN8720 is not set
+# CONFIG_ETH0_PHY_LAN8740 is not set
+# CONFIG_ETH0_PHY_LAN8740A is not set
+# CONFIG_ETH0_PHY_LAN8742A is not set
+# CONFIG_ETH0_PHY_DM9161 is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -764,7 +836,24 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USART2_DMA is not set
 # CONFIG_PSEUDOTERM is not set
 # CONFIG_USBDEV is not set
-# CONFIG_USBHOST is not set
+CONFIG_USBHOST=y
+CONFIG_USBHOST_NPREALLOC=4
+CONFIG_USBHOST_HAVE_ASYNCH=y
+# CONFIG_USBHOST_ASYNCH is not set
+# CONFIG_USBHOST_HUB is not set
+CONFIG_USBHOST_MSC=y
+# CONFIG_USBHOST_CDCACM is not set
+CONFIG_USBHOST_HIDKBD=y
+CONFIG_HIDKBD_POLLUSEC=100000
+CONFIG_HIDKBD_DEFPRIO=50
+CONFIG_HIDKBD_STACKSIZE=1024
+CONFIG_HIDKBD_BUFSIZE=64
+CONFIG_HIDKBD_NPOLLWAITERS=2
+# CONFIG_HIDKBD_RAWSCANCODES is not set
+# CONFIG_HIDKBD_ALLSCANCODES is not set
+# CONFIG_HIDKBD_NODEBOUNCE is not set
+# CONFIG_USBHOST_HIDMOUSE is not set
+# CONFIG_USBHOST_TRACE is not set
 # CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
@@ -804,18 +893,34 @@ CONFIG_SYSLOG_CONSOLE=y
 # CONFIG_DISABLE_MOUNTPOINT is not set
 # CONFIG_FS_AUTOMOUNTER is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
-# CONFIG_FS_READABLE is not set
-# CONFIG_FS_WRITABLE is not set
+CONFIG_FS_READABLE=y
+CONFIG_FS_WRITABLE=y
 # CONFIG_FS_NAMED_SEMAPHORES is not set
 CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
-# CONFIG_FS_FAT is not set
+CONFIG_FS_FAT=y
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FAT_MAXFNAME=32
+# CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
+# CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
-# CONFIG_FS_PROCFS is not set
+CONFIG_FS_PROCFS=y
+CONFIG_FS_PROCFS_REGISTER=y
+
+#
+# Exclude individual procfs entries
+#
+# CONFIG_FS_PROCFS_EXCLUDE_PROCESS is not set
+# CONFIG_FS_PROCFS_EXCLUDE_UPTIME is not set
+# CONFIG_FS_PROCFS_EXCLUDE_CPULOAD is not set
+# CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
 #
@@ -878,6 +983,8 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 CONFIG_LIBC_STRERROR=y
 CONFIG_LIBC_STRERROR_SHORT=y
 # CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_LIBC_TMPDIR="/tmp"
+CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
 # CONFIG_LIBC_LOCALTIME is not set
 # CONFIG_TIME_EXTENDED is not set
@@ -887,6 +994,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
@@ -922,21 +1030,36 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # Examples
 #
+CONFIG_EXAMPLES_ADC=y
+CONFIG_EXAMPLES_ADC_DEVPATH="/dev/adc0"
+CONFIG_EXAMPLES_ADC_GROUPSIZE=4
+CONFIG_EXAMPLES_ADC_SWTRIG=y
+CONFIG_EXAMPLES_BUTTONS=y
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=4
 # CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HIDKBD is not set
+CONFIG_EXAMPLES_HIDKBD=y
+CONFIG_EXAMPLES_HIDKBD_DEFPRIO=50
+CONFIG_EXAMPLES_HIDKBD_STACKSIZE=1024
+CONFIG_EXAMPLES_HIDKBD_DEVNAME="/dev/kbda"
 # CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
-# CONFIG_EXAMPLES_MOUNT is not set
+CONFIG_EXAMPLES_MOUNT=y
+# CONFIG_EXAMPLES_MOUNT_BLOCKDEVICE is not set
+CONFIG_EXAMPLES_MOUNT_NSECTORS=2048
+CONFIG_EXAMPLES_MOUNT_SECTORSIZE=512
+CONFIG_EXAMPLES_MOUNT_RAMDEVNO=0
 # CONFIG_EXAMPLES_NRF24L01TERM is not set
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
@@ -965,6 +1088,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WEBSERVER is not set
@@ -973,6 +1097,7 @@ CONFIG_EXAMPLES_NSH=y
 # File System Utilities
 #
 # CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
 
 #
 # GPS Utilities
@@ -988,6 +1113,7 @@ CONFIG_EXAMPLES_NSH=y
 #
 # Interpreters
 #
+# CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
@@ -1051,13 +1177,14 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
-CONFIG_NSH_DISABLE_IFUPDOWN=y
+# CONFIG_NSH_DISABLE_IFUPDOWN is not set
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
-CONFIG_NSH_DISABLE_LOSMART=y
+# CONFIG_NSH_DISABLE_LOSMART is not set
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
+# CONFIG_NSH_DISABLE_MKFATFS is not set
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
@@ -1080,6 +1207,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
 CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
 
 #
 # Configure Command Options
@@ -1087,6 +1216,7 @@ CONFIG_NSH_MMCSDMINOR=0
 CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_STRERROR=y
 
@@ -1102,7 +1232,9 @@ CONFIG_NSH_STRERROR=y
 #
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
-# CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_USBKBD is not set
+CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_SWMAC is not set
 # CONFIG_NSH_LOGIN is not set
 # CONFIG_NSH_CONSOLE_LOGIN is not set
 
@@ -1120,7 +1252,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_SYSTEM_RAMTEST=y
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y