diff --git a/arch/arm/src/a1x/Kconfig b/arch/arm/src/a1x/Kconfig
index a15ecab9cb..324f2d288b 100644
--- a/arch/arm/src/a1x/Kconfig
+++ b/arch/arm/src/a1x/Kconfig
@@ -22,41 +22,49 @@ config A1X_UART0
 	bool "UART 0"
 	default n
 	select ARCH_HAVE_UART0
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config A1X_UART1
 	bool "UART 1"
 	default n
 	select ARCH_HAVE_UART1
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config A1X_UART2
 	bool "UART 2"
 	default n
 	select ARCH_HAVE_UART2
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config A1X_UART3
 	bool "UART 3"
 	default n
 	select ARCH_HAVE_UART3
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config A1X_UART4
 	bool "UART 4"
 	default n
 	select ARCH_HAVE_UART4
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config A1X_UART5
 	bool "UART 5"
 	default n
 	select ARCH_HAVE_UART5
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config A1X_UART6
 	bool "UART 6"
 	default n
 	select ARCH_HAVE_UART6
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config A1X_UART7
 	bool "UART 7"
 	default n
 	select ARCH_HAVE_UART7
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config A1X_IR0
 	bool "IR 0"
diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig
index 0352eb0876..d874546b45 100644
--- a/arch/arm/src/lpc17xx/Kconfig
+++ b/arch/arm/src/lpc17xx/Kconfig
@@ -169,28 +169,33 @@ config LPC17_SDCARD
 
 config LPC17_UART0
 	bool "UART0"
-	select ARCH_HAVE_UART0
 	default n
+	select ARCH_HAVE_UART0
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config LPC17_UART1
 	bool "UART1"
-	select ARCH_HAVE_UART1
 	default n
+	select ARCH_HAVE_UART1
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config LPC17_UART2
 	bool "UART2"
-	select ARCH_HAVE_UART2
 	default n
+	select ARCH_HAVE_UART2
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config LPC17_UART3
 	bool "UART3"
-	select ARCH_HAVE_UART3
 	default n
+	select ARCH_HAVE_UART3
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config LPC17_UART4
 	bool "UART4"
-	select ARCH_HAVE_UART4
 	default n
+	select ARCH_HAVE_UART4
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config LPC17_CAN1
 	bool "CAN1"
@@ -465,15 +470,6 @@ endmenu
 menu "Serial driver options"
 	depends on LPC17_UART0 || LPC17_UART1 || LPC17_UART2 || LPC17_UART3 || LPC17_UART4
 
-config SERIAL_TERMIOS
-	bool "Serial driver TERMIOS supported"
-	depends on LPC17_UART0 || LPC17_UART1 || LPC17_UART2 || LPC17_UART3
-	default n
-	---help---
-		Serial driver supports termios.h interfaces (tcsetattr, tcflush, etc.).
-		If this is not defined, then the terminal settings (baud, parity, etc).
-		are not configurable at runtime; serial streams cannot be flushed, etc..
-
 config UART1_RINGINDICATOR
 	bool "UART1 ring indicator"
 	depends on LPC17_UART1
diff --git a/arch/arm/src/lpc43xx/Kconfig b/arch/arm/src/lpc43xx/Kconfig
index 703eae9e95..8698c4f6d2 100644
--- a/arch/arm/src/lpc43xx/Kconfig
+++ b/arch/arm/src/lpc43xx/Kconfig
@@ -254,23 +254,27 @@ config LPC43_TMR3
 
 config LPC43_USART0
 	bool "USART0"
-	select ARCH_HAVE_USART0
 	default n
+	select ARCH_HAVE_USART0
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config LPC43_UART1
 	bool "UART1"
-	select ARCH_HAVE_UART1
 	default n
+	select ARCH_HAVE_UART1
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config LPC43_USART2
 	bool "USART2"
-	select ARCH_HAVE_USART2
 	default n
+	select ARCH_HAVE_USART2
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config LPC43_USART3
 	bool "USART3"
-	select ARCH_HAVE_USART3
 	default n
+	select ARCH_HAVE_USART3
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config LPC43_USB0
 	bool "USB0"
@@ -290,12 +294,3 @@ config LPC43_WWDT
 	default n
 
 endmenu
-
-config SERIAL_TERMIOS
-	bool "Serial driver TERMIOS supported"
-	depends on LPC43_USART0 || LPC43_UART1 || LPC43_USART2 || LPC43_USART3
-	default n
-	---help---
-		Serial driver supports termios.h interfaces (tcsetattr, tcflush, etc.).
-		If this is not defined, then the terminal settings (baud, parity, etc).
-		are not configurable at runtime; serial streams cannot be flushed, etc..
diff --git a/arch/arm/src/nuc1xx/Kconfig b/arch/arm/src/nuc1xx/Kconfig
index 13c60a4c73..5c4b86ac42 100644
--- a/arch/arm/src/nuc1xx/Kconfig
+++ b/arch/arm/src/nuc1xx/Kconfig
@@ -315,17 +315,20 @@ config NUC_UART0
 	bool "UART0"
 	default y
 	select ARCH_HAVE_UART0
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config NUC_UART1
 	bool "UART1"
 	default n
 	select ARCH_HAVE_UART1
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config NUC_UART2
 	bool "UART2"
 	default n
-	depends on NUC_HAVE_UART1
+	depends on NUC_HAVE_UART2
 	select ARCH_HAVE_UART2
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config NUC_USBD
 	bool "USB 2.0 FS device controller"
diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index 60f8d20da7..6183d16add 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -616,8 +616,8 @@ config STM32_VALUELINE
 	bool
 	default n
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM5
 	select STM32_HAVE_TIM6
@@ -637,8 +637,8 @@ config STM32_CONNECTIVITYLINE
 	default n
 	select STM32_HAVE_OTGFS
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM5
 	select STM32_HAVE_TIM6
@@ -656,8 +656,8 @@ config STM32_PERFORMANCELINE
 	default n
 	select STM32_HAVE_USBDEV
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM5
 	select STM32_HAVE_TIM6
@@ -671,8 +671,8 @@ config STM32_HIGHDENSITY
 	default n
 	select STM32_HAVE_FSMC
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM5
 	select STM32_HAVE_TIM6
@@ -686,8 +686,8 @@ config STM32_MEDIUMDENSITY
 	bool
 	default n
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM5
 	select STM32_HAVE_TIM6
@@ -701,8 +701,8 @@ config STM32_LOWDENSITY
 	bool
 	default n
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM5
 	select STM32_HAVE_TIM6
@@ -721,8 +721,8 @@ config STM32_STM32F207
 	select STM32_HAVE_OTGFS
 	select STM32_HAVE_FSMC
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_USART6
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM5
@@ -801,8 +801,8 @@ config STM32_STM32F405
 	select STM32_HAVE_FSMC
 	select STM32_HAVE_CCM
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_USART6
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM5
@@ -827,8 +827,8 @@ config STM32_STM32F407
 	select STM32_HAVE_FSMC
 	select STM32_HAVE_CCM
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_USART6
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM5
@@ -855,11 +855,11 @@ config STM32_STM32F427
 	select STM32_HAVE_FSMC
 	select STM32_HAVE_CCM
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_USART6
-	select STM32_HAVE_USART7
-	select STM32_HAVE_USART8
+	select STM32_HAVE_UART7
+	select STM32_HAVE_UART8
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM5
 	select STM32_HAVE_TIM6
@@ -889,11 +889,11 @@ config STM32_STM32F429
 	select STM32_HAVE_FSMC
 	select STM32_HAVE_CCM
 	select STM32_HAVE_USART3
-	select STM32_HAVE_USART4
-	select STM32_HAVE_USART5
+	select STM32_HAVE_UART4
+	select STM32_HAVE_UART5
 	select STM32_HAVE_USART6
-	select STM32_HAVE_USART7
-	select STM32_HAVE_USART8
+	select STM32_HAVE_UART7
+	select STM32_HAVE_UART8
 	select STM32_HAVE_TIM1
 	select STM32_HAVE_TIM6
 	select STM32_HAVE_TIM7
@@ -948,11 +948,11 @@ config STM32_HAVE_USART3
 	bool
 	default n
 
-config STM32_HAVE_USART4
+config STM32_HAVE_UART4
 	bool
 	default n
 
-config STM32_HAVE_USART5
+config STM32_HAVE_UART5
 	bool
 	default n
 
@@ -960,11 +960,11 @@ config STM32_HAVE_USART6
 	bool
 	default n
 
-config STM32_HAVE_USART7
+config STM32_HAVE_UART7
 	bool
 	default n
 
-config STM32_HAVE_USART8
+config STM32_HAVE_UART8
 	bool
 	default n
 
@@ -1375,32 +1375,37 @@ config STM32_USART1
 	bool "USART1"
 	default n
 	select ARCH_HAVE_USART1
+	select ARCH_HAVE_SERIAL_TERMIOS
 	select STM32_USART
 
 config STM32_USART2
 	bool "USART2"
 	default n
 	select ARCH_HAVE_USART2
+	select ARCH_HAVE_SERIAL_TERMIOS
 	select STM32_USART
 
 config STM32_USART3
 	bool "USART3"
 	default n
 	depends on STM32_HAVE_USART3
+	select ARCH_HAVE_SERIAL_TERMIOS
 	select ARCH_HAVE_USART3
 	select STM32_USART
 
 config STM32_UART4
 	bool "UART4"
 	default n
-	depends on STM32_HAVE_USART4
+	depends on STM32_HAVE_UART4
+	select ARCH_HAVE_SERIAL_TERMIOS
 	select ARCH_HAVE_UART4
 	select STM32_USART
 
 config STM32_UART5
 	bool "UART5"
 	default n
-	depends on STM32_HAVE_USART5
+	depends on STM32_HAVE_UART5
+	select ARCH_HAVE_SERIAL_TERMIOS
 	select ARCH_HAVE_UART5
 	select STM32_USART
 
@@ -1408,20 +1413,23 @@ config STM32_USART6
 	bool "USART6"
 	default n
 	depends on STM32_HAVE_USART6
+	select ARCH_HAVE_SERIAL_TERMIOS
 	select ARCH_HAVE_USART6
 	select STM32_USART
 
 config STM32_UART7
 	bool "UART7"
 	default n
-	depends on STM32_HAVE_USART7
+	depends on STM32_HAVE_UART7
+	select ARCH_HAVE_SERIAL_TERMIOS
 	select ARCH_HAVE_UART7
 	select STM32_USART
 
 config STM32_UART8
 	bool "UART8"
 	default n
-	depends on STM32_HAVE_USART7
+	depends on STM32_HAVE_UART8
+	select ARCH_HAVE_SERIAL_TERMIOS
 	select ARCH_HAVE_UART8
 	select STM32_USART
 
@@ -3057,15 +3065,6 @@ config UART8_RXDMA
 	---help---
 		In high data rate usage, Rx DMA may eliminate Rx overrun errors
 
-config SERIAL_TERMIOS
-	bool "Serial driver TERMIOS supported"
-	depends on STM32_USART1 || STM32_USART2 || STM32_USART3 || STM32_UART4 || STM32_UART5 || STM32_USART6 || STM32_UART7 || STM32_UART8
-	default n
-	---help---
-		Serial driver supports termios.h interfaces (tcsetattr, tcflush, etc.).
-		If this is not defined, then the terminal settings (baud, parity, etc).
-		are not configurable at runtime; serial streams cannot be flushed, etc..
-
 config SERIAL_DISABLE_REORDERING
 	bool "Disable reordering of ttySx devices."
 	depends on STM32_USART1 || STM32_USART2 || STM32_USART3 || STM32_UART4 || STM32_UART5 || STM32_USART6 || STM32_UART7 || STM32_UART8
diff --git a/arch/arm/src/stm32/stm32_uart.h b/arch/arm/src/stm32/stm32_uart.h
index adbf9582f5..2229e00363 100644
--- a/arch/arm/src/stm32/stm32_uart.h
+++ b/arch/arm/src/stm32/stm32_uart.h
@@ -65,19 +65,19 @@
  * device.
  */
 
-#if STM32_NUSART < 8 || !defined(CONFIG_STM32_HAVE_USART8)
+#if STM32_NUSART < 8 || !defined(CONFIG_STM32_HAVE_UART8)
 #  undef CONFIG_STM32_UART8
 #endif
-#if STM32_NUSART < 7 || !defined(CONFIG_STM32_HAVE_USART7)
+#if STM32_NUSART < 7 || !defined(CONFIG_STM32_HAVE_UART7)
 #  undef CONFIG_STM32_UART7
 #endif
 #if STM32_NUSART < 6 || !defined(CONFIG_STM32_HAVE_USART6)
 #  undef CONFIG_STM32_USART6
 #endif
-#if STM32_NUSART < 5 || !defined(CONFIG_STM32_HAVE_USART5)
+#if STM32_NUSART < 5 || !defined(CONFIG_STM32_HAVE_UART5)
 #  undef CONFIG_STM32_UART5
 #endif
-#if STM32_NUSART < 4 || !defined(CONFIG_STM32_HAVE_USART4)
+#if STM32_NUSART < 4 || !defined(CONFIG_STM32_HAVE_UART4)
 #  undef CONFIG_STM32_UART4
 #endif
 #if STM32_NUSART < 3 || !defined(CONFIG_STM32_HAVE_USART3)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4c5ed8b9d1..1a6bf9537b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -14,6 +14,7 @@ config ARCH_CHIP_PIC32MX
 	select ARCH_HAVE_IRQPRIO
 	select ARCH_VECNOTIRQ
 	select ARCH_HAVE_RAMFUNCS
+	select ARCH_HAVE_SERIAL_TERMIOS
 	---help---
 		Microchip PIC32MX320F032H (MIPS32)
 
diff --git a/arch/mips/src/pic32mx/Kconfig b/arch/mips/src/pic32mx/Kconfig
index 6049337829..e2f17ce105 100644
--- a/arch/mips/src/pic32mx/Kconfig
+++ b/arch/mips/src/pic32mx/Kconfig
@@ -565,31 +565,37 @@ config PIC32MX_UART1
 	bool "UART1"
 	default n
 	select ARCH_HAVE_UART1
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config PIC32MX_UART2
 	bool "UART2"
 	default n
 	select ARCH_HAVE_UART2
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config PIC32MX_UART3
 	bool "UART3"
 	default n
 	select ARCH_HAVE_UART3
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config PIC32MX_UART4
 	bool "UART4"
 	default n
 	select ARCH_HAVE_UART4
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config PIC32MX_UART5
 	bool "UART5"
 	default n
 	select ARCH_HAVE_UART5
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config PIC32MX_UART6
 	bool "UART6"
 	default n
 	select ARCH_HAVE_UART6
+	select ARCH_HAVE_SERIAL_TERMIOS
 
 config PIC32MX_ADC
 	bool "ADC1"
@@ -990,15 +996,6 @@ config PIC32MX_USBPRIO
 
 endmenu
 
-config SERIAL_TERMIOS
-	bool "Serial driver TERMIOS supported"
-	depends on PIC32MX_UART1 || PIC32MX_UART2 || PIC32MX_UART3 || PIC32MX_UART4 || PIC32MX_UART5 || PIC32MX_UART6
-	default n
-	---help---
-		Serial driver supports termios.h interfaces (tcsetattr, tcflush, etc.).
-		If this is not defined, then the terminal settings (baud, parity, etc).
-		are not configurable at runtime; serial streams cannot be flushed, etc..
-
 menu "PIC32MX PHY/Ethernet device driver settings"
 	depends on PIC32MX_ETHERNET
 
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index a75bd5a46c..df08030f89 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -231,11 +231,11 @@ CONFIG_STM32_HAVE_CCM=y
 CONFIG_STM32_HAVE_OTGFS=y
 CONFIG_STM32_HAVE_FSMC=y
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 CONFIG_STM32_HAVE_USART6=y
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 CONFIG_STM32_HAVE_TIM6=y
diff --git a/configs/nucleo-f4x1re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig
index ba0a19c667..ad6daa0d52 100644
--- a/configs/nucleo-f4x1re/f401-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f401-nsh/defconfig
@@ -227,11 +227,11 @@ CONFIG_STM32_STM32F401=y
 CONFIG_STM32_HAVE_OTGFS=y
 # CONFIG_STM32_HAVE_FSMC is not set
 # CONFIG_STM32_HAVE_USART3 is not set
-# CONFIG_STM32_HAVE_USART4 is not set
-# CONFIG_STM32_HAVE_USART5 is not set
+# CONFIG_STM32_HAVE_UART4 is not set
+# CONFIG_STM32_HAVE_UART5 is not set
 CONFIG_STM32_HAVE_USART6=y
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 # CONFIG_STM32_HAVE_TIM6 is not set
diff --git a/configs/nucleo-f4x1re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig
index 7b438c986e..17e704b2c1 100755
--- a/configs/nucleo-f4x1re/f411-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f411-nsh/defconfig
@@ -227,11 +227,11 @@ CONFIG_STM32_STM32F411=y
 CONFIG_STM32_HAVE_OTGFS=y
 # CONFIG_STM32_HAVE_FSMC is not set
 # CONFIG_STM32_HAVE_USART3 is not set
-# CONFIG_STM32_HAVE_USART4 is not set
-# CONFIG_STM32_HAVE_USART5 is not set
+# CONFIG_STM32_HAVE_UART4 is not set
+# CONFIG_STM32_HAVE_UART5 is not set
 CONFIG_STM32_HAVE_USART6=y
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 # CONFIG_STM32_HAVE_TIM6 is not set
diff --git a/configs/stm3210e-eval/nxterm/defconfig b/configs/stm3210e-eval/nxterm/defconfig
index 12a20d5be0..ef04efccae 100644
--- a/configs/stm3210e-eval/nxterm/defconfig
+++ b/configs/stm3210e-eval/nxterm/defconfig
@@ -232,11 +232,11 @@ CONFIG_STM32_HAVE_USBDEV=y
 # CONFIG_STM32_HAVE_OTGFS is not set
 CONFIG_STM32_HAVE_FSMC=y
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 # CONFIG_STM32_HAVE_USART6 is not set
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 CONFIG_STM32_HAVE_TIM6=y
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index dcefdbf65c..9772749b59 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -240,11 +240,11 @@ CONFIG_STM32_HAVE_CCM=y
 CONFIG_STM32_HAVE_OTGFS=y
 CONFIG_STM32_HAVE_FSMC=y
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 CONFIG_STM32_HAVE_USART6=y
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 CONFIG_STM32_HAVE_TIM6=y
diff --git a/configs/stm3240g-eval/nxterm/defconfig b/configs/stm3240g-eval/nxterm/defconfig
index b5ef4892dc..f7013bf02a 100644
--- a/configs/stm3240g-eval/nxterm/defconfig
+++ b/configs/stm3240g-eval/nxterm/defconfig
@@ -234,11 +234,11 @@ CONFIG_STM32_HAVE_CCM=y
 CONFIG_STM32_HAVE_OTGFS=y
 CONFIG_STM32_HAVE_FSMC=y
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 CONFIG_STM32_HAVE_USART6=y
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 CONFIG_STM32_HAVE_TIM6=y
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index 2bc7c3aafb..316b69891f 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -234,11 +234,11 @@ CONFIG_STM32_HAVE_CCM=y
 CONFIG_STM32_HAVE_OTGFS=y
 CONFIG_STM32_HAVE_FSMC=y
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 CONFIG_STM32_HAVE_USART6=y
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 CONFIG_STM32_HAVE_TIM6=y
diff --git a/configs/stm32f429i-disco/lcd/defconfig b/configs/stm32f429i-disco/lcd/defconfig
index 35880dec2f..57539d60b6 100644
--- a/configs/stm32f429i-disco/lcd/defconfig
+++ b/configs/stm32f429i-disco/lcd/defconfig
@@ -256,11 +256,11 @@ CONFIG_STM32_HAVE_CCM=y
 CONFIG_STM32_HAVE_OTGFS=y
 CONFIG_STM32_HAVE_FSMC=y
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 CONFIG_STM32_HAVE_USART6=y
-CONFIG_STM32_HAVE_USART7=y
-CONFIG_STM32_HAVE_USART8=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
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index 355f0364eb..08774d3b2f 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -239,11 +239,11 @@ CONFIG_STM32_HAVE_CCM=y
 CONFIG_STM32_HAVE_OTGFS=y
 CONFIG_STM32_HAVE_FSMC=y
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 CONFIG_STM32_HAVE_USART6=y
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 CONFIG_STM32_HAVE_TIM6=y
diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig
index a89d0199c5..9c0c220f04 100644
--- a/configs/stm32f4discovery/netnsh/defconfig
+++ b/configs/stm32f4discovery/netnsh/defconfig
@@ -237,11 +237,11 @@ CONFIG_STM32_HAVE_CCM=y
 CONFIG_STM32_HAVE_OTGFS=y
 CONFIG_STM32_HAVE_FSMC=y
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 CONFIG_STM32_HAVE_USART6=y
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 CONFIG_STM32_HAVE_TIM6=y
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 3f02046924..a4b1c03004 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -233,11 +233,11 @@ CONFIG_STM32_HAVE_CCM=y
 CONFIG_STM32_HAVE_OTGFS=y
 CONFIG_STM32_HAVE_FSMC=y
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 CONFIG_STM32_HAVE_USART6=y
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 CONFIG_STM32_HAVE_TIM6=y
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index 147fec543e..6488d86b20 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -233,11 +233,11 @@ CONFIG_STM32_CONNECTIVITYLINE=y
 CONFIG_STM32_HAVE_OTGFS=y
 # CONFIG_STM32_HAVE_FSMC is not set
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 # CONFIG_STM32_HAVE_USART6 is not set
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 CONFIG_STM32_HAVE_TIM6=y
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index 8317b2f3b1..5587cdd393 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_WINDOWS_CYGWIN=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -75,6 +76,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
@@ -105,7 +107,6 @@ CONFIG_ARCH_CHIP="stm32"
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARCH_HAVE_FPU is not set
-CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
 
 #
@@ -119,7 +120,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # 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_ARMV7M_ITMSYSLOG is not set
 
 #
 # STM32 Configuration Options
@@ -155,16 +156,18 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARCH_CHIP_STM32F100VC is not set
 # CONFIG_ARCH_CHIP_STM32F100VD is not set
 # CONFIG_ARCH_CHIP_STM32F100VE is not set
-# CONFIG_ARCH_CHIP_STM32F103C4 is not set
-# CONFIG_ARCH_CHIP_STM32F103C8 is not set
 # CONFIG_ARCH_CHIP_STM32F103T8 is not set
 # CONFIG_ARCH_CHIP_STM32F103TB is not set
+# CONFIG_ARCH_CHIP_STM32F103C4 is not set
+# CONFIG_ARCH_CHIP_STM32F103C8 is not set
 # CONFIG_ARCH_CHIP_STM32F103CB is not set
 # CONFIG_ARCH_CHIP_STM32F103R8 is not set
 # CONFIG_ARCH_CHIP_STM32F103RB is not set
+# CONFIG_ARCH_CHIP_STM32F103RC is not set
+# CONFIG_ARCH_CHIP_STM32F103RD is not set
+# CONFIG_ARCH_CHIP_STM32F103RE is not set
 # CONFIG_ARCH_CHIP_STM32F103V8 is not set
 # CONFIG_ARCH_CHIP_STM32F103VB is not set
-# CONFIG_ARCH_CHIP_STM32F103RE is not set
 # CONFIG_ARCH_CHIP_STM32F103VC is not set
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
@@ -185,6 +188,7 @@ CONFIG_ARCH_CHIP_STM32F107VC=y
 # CONFIG_ARCH_CHIP_STM32F303VB is not set
 # CONFIG_ARCH_CHIP_STM32F303VC is not set
 # CONFIG_ARCH_CHIP_STM32F401RE is not set
+# CONFIG_ARCH_CHIP_STM32F411RE is not set
 # CONFIG_ARCH_CHIP_STM32F405RG is not set
 # CONFIG_ARCH_CHIP_STM32F405VG is not set
 # CONFIG_ARCH_CHIP_STM32F405ZG is not set
@@ -216,6 +220,7 @@ CONFIG_STM32_CONNECTIVITYLINE=y
 # CONFIG_STM32_STM32F30XX is not set
 # CONFIG_STM32_STM32F40XX is not set
 # CONFIG_STM32_STM32F401 is not set
+# CONFIG_STM32_STM32F411 is not set
 # CONFIG_STM32_STM32F405 is not set
 # CONFIG_STM32_STM32F407 is not set
 # CONFIG_STM32_STM32F427 is not set
@@ -230,11 +235,11 @@ CONFIG_STM32_CONNECTIVITYLINE=y
 CONFIG_STM32_HAVE_OTGFS=y
 # CONFIG_STM32_HAVE_FSMC is not set
 CONFIG_STM32_HAVE_USART3=y
-CONFIG_STM32_HAVE_USART4=y
-CONFIG_STM32_HAVE_USART5=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
 # CONFIG_STM32_HAVE_USART6 is not set
-# CONFIG_STM32_HAVE_USART7 is not set
-# CONFIG_STM32_HAVE_USART8 is not set
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
 CONFIG_STM32_HAVE_TIM1=y
 CONFIG_STM32_HAVE_TIM5=y
 CONFIG_STM32_HAVE_TIM6=y
@@ -256,6 +261,10 @@ CONFIG_STM32_HAVE_CAN1=y
 CONFIG_STM32_HAVE_CAN2=y
 # CONFIG_STM32_HAVE_RNG is not set
 CONFIG_STM32_HAVE_ETHMAC=y
+CONFIG_STM32_HAVE_SPI2=y
+CONFIG_STM32_HAVE_SPI3=y
+# CONFIG_STM32_HAVE_SPI4 is not set
+# CONFIG_STM32_HAVE_SPI5 is not set
 # CONFIG_STM32_ADC1 is not set
 # CONFIG_STM32_ADC2 is not set
 # CONFIG_STM32_BKP is not set
@@ -311,7 +320,15 @@ CONFIG_STM32_USART=y
 # CONFIG_STM32_USART_SINGLEWIRE is not set
 
 #
-# USB Host Configuration
+# USB FS Host Configuration
+#
+
+#
+# USB HS Host Configuration
+#
+
+#
+# USB Host Debug Configuration
 #
 
 #
@@ -325,11 +342,16 @@ CONFIG_STM32_USART=y
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_ARCH_ADDRENV is not set
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -419,6 +441,9 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Tasks and Scheduling
 #
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
 CONFIG_TASK_NAME_SIZE=0
@@ -474,6 +499,16 @@ CONFIG_SIG_SIGWORK=17
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
 
+#
+# Work Queue Support
+#
+CONFIG_SCHED_WORKQUEUE=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_HPWORKPRIORITY=192
+CONFIG_SCHED_HPWORKPERIOD=50000
+CONFIG_SCHED_HPWORKSTACKSIZE=1024
+# CONFIG_SCHED_LPWORK is not set
+
 #
 # Stack and heap information
 #
@@ -481,6 +516,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -489,6 +525,12 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
@@ -537,6 +579,7 @@ CONFIG_ARCH_HAVE_USART1=y
 # CONFIG_ARCH_HAVE_USART6 is not set
 # CONFIG_ARCH_HAVE_USART7 is not set
 # CONFIG_ARCH_HAVE_USART8 is not set
+# CONFIG_ARCH_HAVE_OTHER_UART is not set
 
 #
 # USART Configuration
@@ -545,7 +588,10 @@ CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
+CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
+# CONFIG_SERIAL_TERMIOS is not set
 CONFIG_USART1_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -581,6 +627,11 @@ CONFIG_USART1_2STOP=0
 # CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
 #
 # File Systems
 #
@@ -589,9 +640,12 @@ CONFIG_USART1_2STOP=0
 # File system configuration
 #
 # 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_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_NXFFS is not set
@@ -603,7 +657,6 @@ CONFIG_USART1_2STOP=0
 #
 # System Logging
 #
-
 # CONFIG_SYSLOG is not set
 
 #
@@ -625,7 +678,7 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -660,6 +713,7 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
@@ -667,12 +721,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Library Support
 #
-CONFIG_SCHED_WORKQUEUE=y
-CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SCHED_HPWORKPERIOD=50000
-CONFIG_SCHED_HPWORKSTACKSIZE=1024
-# CONFIG_SCHED_LPWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -775,6 +823,7 @@ CONFIG_NETUTILS_TFTPC=y
 CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
+CONFIG_WEBCLIENT_TIMEOUT=10
 
 #
 # FreeModBus
@@ -785,8 +834,20 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+
+#
+# Command Line Configuration
+#
 CONFIG_NSH_READLINE=y
 # CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=80
+# CONFIG_NSH_DISABLE_SEMICOLON is not set
+CONFIG_NSH_CMDPARMS=y
+CONFIG_NSH_TMPDIR="/tmp"
+CONFIG_NSH_MAXARGUMENTS=6
+CONFIG_NSH_ARGCAT=y
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
@@ -840,22 +901,18 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_NSH_FILEIOSIZE=1024
-CONFIG_NSH_LINELEN=80
-# CONFIG_NSH_DISABLE_SEMICOLON is not set
-CONFIG_NSH_CMDPARMS=y
-CONFIG_NSH_TMPDIR="/tmp"
-CONFIG_NSH_MAXARGUMENTS=6
-CONFIG_NSH_ARGCAT=y
-CONFIG_NSH_NESTDEPTH=3
+
+#
+# Scripting Support
+#
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLE_ITEF is not set
 # CONFIG_NSH_DISABLE_LOOPS is not set
-# CONFIG_NSH_DISABLEBG is not set
-CONFIG_NSH_CONSOLE=y
 
 #
-# USB Trace Support
+# Console Configuration
 #
+CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
@@ -891,6 +948,11 @@ CONFIG_NSH_CONSOLE=y
 # FLASH Erase-all Command
 #
 
+#
+# Intel HEX to binary conversion
+#
+# CONFIG_SYSTEM_HEX2BIN is not set
+
 #
 # I2C tool
 #
@@ -920,6 +982,10 @@ CONFIG_READLINE_ECHO=y
 # P-Code Support
 #
 
+#
+# PHY Tool
+#
+
 #
 # Power Off
 #
@@ -935,6 +1001,11 @@ CONFIG_READLINE_ECHO=y
 #
 # CONFIG_SYSTEM_SDCARD is not set
 
+#
+# Sudoku
+#
+# CONFIG_SYSTEM_SUDOKU is not set
+
 #
 # Sysinfo
 #
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 7e7b6a3c5d..759e50b1ae 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -533,6 +533,19 @@ config SERIAL_TIOCSERGSTRUCT
 		supports the TIOCSERGSTRUCT ioctl, and (2) this option is selected, then
 		support for the TIOCSERGSTRUCT will be enabled.
 
+config ARCH_HAVE_SERIAL_TERMIOS
+	bool
+	default n
+
+config SERIAL_TERMIOS
+	bool "Serial TERMIOS support"
+	depends on ARCH_HAVE_SERIAL_TERMIOS
+	default n
+	---help---
+		Serial driver supports termios.h interfaces (tcsetattr, tcflush, etc.).
+		If this is not defined, then the terminal settings (baud, parity, etc).
+		are not configurable at runtime; serial streams cannot be flushed, etc..
+
 #
 # Serial console selection
 #
@@ -1837,4 +1850,3 @@ config SERIAL_IFLOWCONTROL
 config SERIAL_OFLOWCONTROL
 	bool
 	default n
-