diff --git a/configs/stm32f746g-disco/nsh/defconfig b/configs/stm32f746g-disco/nsh/defconfig
index 96894813929..801f22b56c4 100644
--- a/configs/stm32f746g-disco/nsh/defconfig
+++ b/configs/stm32f746g-disco/nsh/defconfig
@@ -8,10 +8,12 @@
 #
 # CONFIG_EXPERIMENTAL is not set
 # CONFIG_DEFAULT_SMALL is not set
-CONFIG_HOST_LINUX=y
+# CONFIG_HOST_LINUX is not set
 # CONFIG_HOST_OSX is not set
-# CONFIG_HOST_WINDOWS is not set
+CONFIG_HOST_WINDOWS=y
 # CONFIG_HOST_OTHER is not set
+CONFIG_WINDOWS_CYGWIN=y
+# CONFIG_WINDOWS_NATIVE is not set
 
 #
 # Build Configuration
@@ -90,7 +92,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
-CONFIG_ARCH_CHIP_STM32Fy=y
+CONFIG_ARCH_CHIP_STM32F7=y
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
@@ -141,125 +143,90 @@ CONFIG_ARCH_CHIP_STM32F746=y
 #
 # STM32 Peripheral Support
 #
-CONFIG_STM32_HAVE_CCM=y
-# CONFIG_STM32_HAVE_USBDEV is not set
-CONFIG_STM32_HAVE_OTGFS=y
-CONFIG_STM32_HAVE_FSMC=y
-CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_UART4=y
-CONFIG_STM32_HAVE_UART5=y
-CONFIG_STM32_HAVE_USART6=y
-CONFIG_STM32_HAVE_UART7=y
-CONFIG_STM32_HAVE_UART8=y
-CONFIG_STM32_HAVE_TIM1=y
-# CONFIG_STM32_HAVE_TIM5 is not set
-CONFIG_STM32_HAVE_TIM6=y
-CONFIG_STM32_HAVE_TIM7=y
-CONFIG_STM32_HAVE_TIM8=y
-CONFIG_STM32_HAVE_TIM9=y
-CONFIG_STM32_HAVE_TIM10=y
-CONFIG_STM32_HAVE_TIM11=y
-CONFIG_STM32_HAVE_TIM12=y
-CONFIG_STM32_HAVE_TIM13=y
-CONFIG_STM32_HAVE_TIM14=y
-# CONFIG_STM32_HAVE_TIM15 is not set
-# CONFIG_STM32_HAVE_TIM16 is not set
-# CONFIG_STM32_HAVE_TIM17 is not set
-CONFIG_STM32_HAVE_ADC2=y
-CONFIG_STM32_HAVE_ADC3=y
-# CONFIG_STM32_HAVE_ADC4 is not set
-CONFIG_STM32_HAVE_CAN1=y
-CONFIG_STM32_HAVE_CAN2=y
-CONFIG_STM32_HAVE_RNG=y
-CONFIG_STM32_HAVE_ETHMAC=y
-CONFIG_STM32_HAVE_SPI2=y
-CONFIG_STM32_HAVE_SPI3=y
-CONFIG_STM32_HAVE_SPI4=y
-CONFIG_STM32_HAVE_SPI5=y
-CONFIG_STM32_HAVE_SPI6=y
-# CONFIG_STM32_ADC1 is not set
-# CONFIG_STM32_ADC2 is not set
-# CONFIG_STM32_ADC3 is not set
-# CONFIG_STM32_BKPSRAM is not set
-# CONFIG_STM32_CAN1 is not set
-# CONFIG_STM32_CAN2 is not set
-# CONFIG_STM32_CCMDATARAM is not set
-# CONFIG_STM32_CRC is not set
-# CONFIG_STM32_CRYP is not set
-# CONFIG_STM32_DMA1 is not set
-# CONFIG_STM32_DMA2 is not set
-# CONFIG_STM32_DAC1 is not set
-# CONFIG_STM32_DAC2 is not set
-# CONFIG_STM32_DCMI is not set
-# CONFIG_STM32_ETHMAC is not set
-CONFIG_STM32_FSMC=y
-# CONFIG_STM32_HASH is not set
-# CONFIG_STM32_I2C1 is not set
-# CONFIG_STM32_I2C2 is not set
-# CONFIG_STM32_I2C3 is not set
-# CONFIG_STM32_LTDC is not set
-# CONFIG_STM32_DMA2D is not set
-# CONFIG_STM32_OTGFS is not set
-# CONFIG_STM32_OTGHS is not set
-CONFIG_STM32_PWR=y
-# CONFIG_STM32_RNG is not set
-# CONFIG_STM32_SDIO is not set
-# CONFIG_STM32_SPI1 is not set
-# CONFIG_STM32_SPI2 is not set
-# CONFIG_STM32_SPI3 is not set
-# CONFIG_STM32_SPI4 is not set
-# CONFIG_STM32_SPI5 is not set
-# CONFIG_STM32_SPI6 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
-# CONFIG_STM32_TIM4 is not set
-# CONFIG_STM32_TIM6 is not set
-# CONFIG_STM32_TIM7 is not set
-# CONFIG_STM32_TIM8 is not set
-# CONFIG_STM32_TIM9 is not set
-# CONFIG_STM32_TIM10 is not set
-# CONFIG_STM32_TIM11 is not set
-# CONFIG_STM32_TIM12 is not set
-# CONFIG_STM32_TIM13 is not set
-# CONFIG_STM32_TIM14 is not set
-CONFIG_STM32_USART1=y
-# CONFIG_STM32_USART2 is not set
-# CONFIG_STM32_USART3 is not set
-# CONFIG_STM32_UART4 is not set
-# CONFIG_STM32_UART5 is not set
-# CONFIG_STM32_USART6 is not set
-# CONFIG_STM32_UART7 is not set
-# CONFIG_STM32_UART8 is not set
-# CONFIG_STM32_IWDG is not set
-# CONFIG_STM32_WWDG is not set
-# CONFIG_STM32_NOEXT_VECTORS is not set
+CONFIG_STM32F7_HAVE_LTDC=y
+# CONFIG_STM32F7_ADC1 is not set
+# CONFIG_STM32F7_ADC2 is not set
+# CONFIG_STM32F7_ADC3 is not set
+# CONFIG_STM32F7_BKPSRAM is not set
+# CONFIG_STM32F7_CAN1 is not set
+# CONFIG_STM32F7_CAN2 is not set
+# CONFIG_STM32F7_CCMDATARAM is not set
+# CONFIG_STM32F7_CRC is not set
+# CONFIG_STM32F7_CRYP is not set
+# CONFIG_STM32F7_DMA1 is not set
+# CONFIG_STM32F7_DMA2 is not set
+# CONFIG_STM32F7_DAC1 is not set
+# CONFIG_STM32F7_DAC2 is not set
+# CONFIG_STM32F7_DCMI is not set
+# CONFIG_STM32F7_ETHMAC is not set
+CONFIG_STM32F7_FSMC=y
+# CONFIG_STM32F7_HASH is not set
+# CONFIG_STM32F7_I2C1 is not set
+# CONFIG_STM32F7_I2C2 is not set
+# CONFIG_STM32F7_I2C3 is not set
+# CONFIG_STM32F7_LTDC is not set
+# CONFIG_STM32F7_DMA2D is not set
+# CONFIG_STM32F7_OTGFS is not set
+# CONFIG_STM32F7_OTGHS is not set
+CONFIG_STM32F7_PWR=y
+# CONFIG_STM32F7_RNG is not set
+# CONFIG_STM32F7_SDIO is not set
+# CONFIG_STM32F7_SPI1 is not set
+# CONFIG_STM32F7_SPI2 is not set
+# CONFIG_STM32F7_SPI3 is not set
+# CONFIG_STM32F7_SPI4 is not set
+# CONFIG_STM32F7_SPI5 is not set
+# CONFIG_STM32F7_SPI6 is not set
+CONFIG_STM32F7_SYSCFG=y
+# CONFIG_STM32F7_TIM1 is not set
+# CONFIG_STM32F7_TIM2 is not set
+# CONFIG_STM32F7_TIM3 is not set
+# CONFIG_STM32F7_TIM4 is not set
+# CONFIG_STM32F7_TIM6 is not set
+# CONFIG_STM32F7_TIM7 is not set
+# CONFIG_STM32F7_TIM8 is not set
+# CONFIG_STM32F7_TIM9 is not set
+# CONFIG_STM32F7_TIM10 is not set
+# CONFIG_STM32F7_TIM11 is not set
+# CONFIG_STM32F7_TIM12 is not set
+# CONFIG_STM32F7_TIM13 is not set
+# CONFIG_STM32F7_TIM14 is not set
+# CONFIG_STM32F7_USART1 is not set
+# CONFIG_STM32F7_USART2 is not set
+# CONFIG_STM32F7_USART3 is not set
+# CONFIG_STM32F7_UART4 is not set
+# CONFIG_STM32F7_UART5 is not set
+CONFIG_STM32F7_USART6=y
+# CONFIG_STM32F7_UART7 is not set
+# CONFIG_STM32F7_UART8 is not set
+# CONFIG_STM32F7_IWDG is not set
+# CONFIG_STM32F7_WWDG is not set
+# CONFIG_STM32F7_NOEXT_VECTORS is not set
 
 #
 # Alternate Pin Mapping
 #
-# CONFIG_STM32_FLASH_PREFETCH is not set
-# CONFIG_STM32_JTAG_DISABLE is not set
-# CONFIG_STM32_JTAG_FULL_ENABLE is not set
-# CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set
-CONFIG_STM32_JTAG_SW_ENABLE=y
-CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
-# CONFIG_STM32_FORCEPOWER is not set
-# CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
-# CONFIG_STM32_CCMEXCLUDE is not set
-CONFIG_STM32_FSMC_SRAM=y
-CONFIG_STM32_USART=y
+# CONFIG_STM32F7_FLASH_PREFETCH is not set
+# CONFIG_STM32F7_JTAG_DISABLE is not set
+# CONFIG_STM32F7_JTAG_FULL_ENABLE is not set
+# CONFIG_STM32F7_JTAG_NOJNTRST_ENABLE is not set
+CONFIG_STM32F7_JTAG_SW_ENABLE=y
+CONFIG_STM32F7_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
+# CONFIG_STM32F7_FORCEPOWER is not set
+# CONFIG_ARCH_BOARD_STM32F7_CUSTOM_CLOCKCONFIG is not set
+# CONFIG_STM32F7_CCMEXCLUDE is not set
+CONFIG_STM32F7_FSMC_SRAM=y
+CONFIG_STM32F7_USART=y
 
 #
 # U[S]ART Configuration
 #
-# CONFIG_USART1_RS485 is not set
+# CONFIG_USART6_RS485 is not set
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
-# CONFIG_STM32_FLOWCONTROL_BROKEN is not set
-# CONFIG_STM32_USART_SINGLEWIRE is not set
-# CONFIG_STM32_HAVE_RTC_COUNTER is not set
-# CONFIG_STM32_HAVE_RTC_SUBSECONDS is not set
+# CONFIG_STM32F7_FLOWCONTROL_BROKEN is not set
+# CONFIG_STM32F7_USART_SINGLEWIRE is not set
+# CONFIG_STM32F7_HAVE_RTC_COUNTER is not set
+# CONFIG_STM32F7_HAVE_RTC_SUBSECONDS is not set
 
 #
 # USB FS Host Configuration
@@ -328,8 +295,8 @@ CONFIG_BOOT_RUNFROMFLASH=y
 #
 # Boot Memory Configuration
 #
-CONFIG_RAM_START=0x20000000
-CONFIG_RAM_SIZE=114688
+CONFIG_RAM_START=0x20010000
+CONFIG_RAM_SIZE=245760
 # CONFIG_ARCH_HAVE_SDRAM is not set
 
 #
@@ -518,12 +485,12 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SCI0 is not set
 # CONFIG_ARCH_HAVE_SCI1 is not set
 # CONFIG_ARCH_HAVE_USART0 is not set
-CONFIG_ARCH_HAVE_USART1=y
+# CONFIG_ARCH_HAVE_USART1 is not set
 # CONFIG_ARCH_HAVE_USART2 is not set
 # CONFIG_ARCH_HAVE_USART3 is not set
 # CONFIG_ARCH_HAVE_USART4 is not set
 # CONFIG_ARCH_HAVE_USART5 is not set
-# CONFIG_ARCH_HAVE_USART6 is not set
+CONFIG_ARCH_HAVE_USART6=y
 # CONFIG_ARCH_HAVE_USART7 is not set
 # CONFIG_ARCH_HAVE_USART8 is not set
 # CONFIG_ARCH_HAVE_OTHER_UART is not set
@@ -531,28 +498,28 @@ CONFIG_ARCH_HAVE_USART1=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
+CONFIG_USART6_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 # CONFIG_SERIAL_TERMIOS is not set
-CONFIG_USART1_SERIAL_CONSOLE=y
+CONFIG_USART6_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
-# USART1 Configuration
+# USART6 Configuration
 #
-CONFIG_USART1_RXBUFSIZE=256
-CONFIG_USART1_TXBUFSIZE=256
-CONFIG_USART1_BAUD=115200
-CONFIG_USART1_BITS=8
-CONFIG_USART1_PARITY=0
-CONFIG_USART1_2STOP=0
-# CONFIG_USART1_IFLOWCONTROL is not set
-# CONFIG_USART1_OFLOWCONTROL is not set
+CONFIG_USART6_RXBUFSIZE=256
+CONFIG_USART6_TXBUFSIZE=256
+CONFIG_USART6_BAUD=115200
+CONFIG_USART6_BITS=8
+CONFIG_USART6_PARITY=0
+CONFIG_USART6_2STOP=0
+# CONFIG_USART6_IFLOWCONTROL is not set
+# CONFIG_USART6_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
@@ -616,10 +583,8 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # Memory Management
 #
 # CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=3
-CONFIG_ARCH_HAVE_HEAP2=y
-CONFIG_HEAP2_BASE=0xD0000000
-CONFIG_HEAP2_SIZE=8388608
+CONFIG_MM_REGIONS=2
+# CONFIG_ARCH_HAVE_HEAP2 is not set
 # CONFIG_GRAN is not set
 
 #
diff --git a/configs/stm32f746g-disco/src/stm32_spi.c b/configs/stm32f746g-disco/src/stm32_spi.c
index fc505da4ffe..3a74c794c99 100644
--- a/configs/stm32f746g-disco/src/stm32_spi.c
+++ b/configs/stm32f746g-disco/src/stm32_spi.c
@@ -49,7 +49,6 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32.h"
 #include "stm32f746g-disco.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || \