summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-04 14:43:56 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-04 14:43:56 +0000
commitc2e050b010291298bee7f99143afdbac5c8058cd (patch)
tree3a69d6f1b54911031273875984ad936555542323
parent1f85386d7ccdbbdcdeb4f0c5090a72a9dc7d5bd0 (diff)
downloadnuttx-c2e050b010291298bee7f99143afdbac5c8058cd.tar.gz
nuttx-c2e050b010291298bee7f99143afdbac5c8058cd.tar.bz2
nuttx-c2e050b010291298bee7f99143afdbac5c8058cd.zip
Changes to Kconfig and matching defconfig files
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5085 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/Kconfig4
-rw-r--r--nuttx/arch/arm/src/stm32/Kconfig38
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_lowputc.c20
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_serial.c62
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_uart.h44
-rw-r--r--nuttx/configs/amber/hello/defconfig4
-rwxr-xr-xnuttx/configs/avr32dev1/nsh/defconfig6
-rwxr-xr-xnuttx/configs/avr32dev1/ostest/defconfig6
-rw-r--r--nuttx/configs/c5471evm/httpd/defconfig6
-rw-r--r--nuttx/configs/c5471evm/nettest/defconfig6
-rw-r--r--nuttx/configs/c5471evm/nsh/defconfig6
-rw-r--r--nuttx/configs/c5471evm/ostest/defconfig6
-rw-r--r--nuttx/configs/compal_e88/nsh_highram/defconfig6
-rw-r--r--nuttx/configs/compal_e99/nsh_compalram/defconfig6
-rw-r--r--nuttx/configs/compal_e99/nsh_highram/defconfig6
-rwxr-xr-xnuttx/configs/demo9s12ne64/ostest/defconfig6
-rw-r--r--nuttx/configs/ea3131/nsh/defconfig4
-rw-r--r--nuttx/configs/ea3131/ostest/defconfig4
-rw-r--r--nuttx/configs/ea3131/pgnsh/defconfig4
-rw-r--r--nuttx/configs/ea3131/usbserial/defconfig4
-rw-r--r--nuttx/configs/ea3131/usbstorage/defconfig4
-rw-r--r--nuttx/configs/ea3152/ostest/defconfig4
-rw-r--r--nuttx/configs/eagle100/httpd/defconfig6
-rw-r--r--nuttx/configs/eagle100/nettest/defconfig6
-rw-r--r--nuttx/configs/eagle100/nsh/defconfig6
-rw-r--r--nuttx/configs/eagle100/nxflat/defconfig6
-rw-r--r--nuttx/configs/eagle100/ostest/defconfig6
-rw-r--r--nuttx/configs/eagle100/thttpd/defconfig6
-rw-r--r--nuttx/configs/ekk-lm3s9b96/nsh/defconfig8
-rw-r--r--nuttx/configs/ekk-lm3s9b96/ostest/defconfig8
-rw-r--r--nuttx/configs/ez80f910200kitg/ostest/defconfig4
-rw-r--r--nuttx/configs/ez80f910200zco/dhcpd/defconfig4
-rw-r--r--nuttx/configs/ez80f910200zco/httpd/defconfig4
-rw-r--r--nuttx/configs/ez80f910200zco/nettest/defconfig4
-rw-r--r--nuttx/configs/ez80f910200zco/nsh/defconfig4
-rw-r--r--nuttx/configs/ez80f910200zco/ostest/defconfig4
-rw-r--r--nuttx/configs/ez80f910200zco/poll/defconfig4
-rw-r--r--nuttx/configs/hymini-stm32v/buttons/defconfig38
-rwxr-xr-xnuttx/configs/hymini-stm32v/nsh/defconfig38
-rw-r--r--nuttx/configs/hymini-stm32v/nsh2/defconfig38
-rw-r--r--nuttx/configs/hymini-stm32v/nx/defconfig38
-rw-r--r--nuttx/configs/hymini-stm32v/nxlines/defconfig38
-rwxr-xr-xnuttx/configs/hymini-stm32v/usbserial/defconfig38
-rwxr-xr-xnuttx/configs/hymini-stm32v/usbstorage/defconfig38
-rw-r--r--nuttx/configs/lincoln60/nsh/defconfig8
-rw-r--r--nuttx/configs/lincoln60/ostest/defconfig8
-rw-r--r--nuttx/configs/lm3s6432-s2e/nsh/defconfig8
-rw-r--r--nuttx/configs/lm3s6432-s2e/ostest/defconfig8
-rwxr-xr-xnuttx/configs/lm3s6965-ek/nsh/defconfig8
-rwxr-xr-xnuttx/configs/lm3s6965-ek/nx/defconfig8
-rwxr-xr-xnuttx/configs/lm3s6965-ek/ostest/defconfig8
-rwxr-xr-xnuttx/configs/lm3s8962-ek/nsh/defconfig8
-rwxr-xr-xnuttx/configs/lm3s8962-ek/nx/defconfig8
-rwxr-xr-xnuttx/configs/lm3s8962-ek/ostest/defconfig8
-rw-r--r--nuttx/configs/lpc4330-xplorer/nsh/defconfig8
-rw-r--r--nuttx/configs/lpc4330-xplorer/ostest/defconfig8
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig8
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/nsh/defconfig8
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/nx/defconfig8
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/ostest/defconfig8
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig8
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig8
-rw-r--r--nuttx/configs/m68332evb/defconfig6
-rw-r--r--nuttx/configs/mbed/hidkbd/defconfig8
-rwxr-xr-xnuttx/configs/mbed/nsh/defconfig8
-rw-r--r--nuttx/configs/mcu123-lpc214x/composite/defconfig6
-rw-r--r--nuttx/configs/mcu123-lpc214x/nsh/defconfig6
-rw-r--r--nuttx/configs/mcu123-lpc214x/ostest/defconfig6
-rw-r--r--nuttx/configs/mcu123-lpc214x/usbserial/defconfig6
-rw-r--r--nuttx/configs/mcu123-lpc214x/usbstorage/defconfig6
-rw-r--r--nuttx/configs/micropendous3/hello/defconfig2
-rw-r--r--nuttx/configs/mirtoo/nsh/defconfig4
-rw-r--r--nuttx/configs/mirtoo/nxffs/defconfig4
-rw-r--r--nuttx/configs/mirtoo/ostest/defconfig4
-rw-r--r--nuttx/configs/mx1ads/ostest/defconfig8
-rwxr-xr-xnuttx/configs/ne64badge/ostest/defconfig6
-rw-r--r--nuttx/configs/ntosd-dm320/nettest/defconfig6
-rw-r--r--nuttx/configs/ntosd-dm320/nsh/defconfig6
-rw-r--r--nuttx/configs/ntosd-dm320/ostest/defconfig6
-rw-r--r--nuttx/configs/ntosd-dm320/poll/defconfig6
-rw-r--r--nuttx/configs/ntosd-dm320/thttpd/defconfig6
-rw-r--r--nuttx/configs/ntosd-dm320/udp/defconfig6
-rw-r--r--nuttx/configs/ntosd-dm320/uip/defconfig6
-rwxr-xr-xnuttx/configs/nucleus2g/nsh/defconfig8
-rwxr-xr-xnuttx/configs/nucleus2g/ostest/defconfig8
-rwxr-xr-xnuttx/configs/nucleus2g/usbserial/defconfig8
-rwxr-xr-xnuttx/configs/nucleus2g/usbstorage/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ftpc/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/hidkbd/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nettest/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nsh/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nx/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ostest/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/thttpd/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbserial/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbstorage/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/wlan/defconfig8
-rwxr-xr-xnuttx/configs/olimex-lpc2378/nsh/defconfig6
-rwxr-xr-xnuttx/configs/olimex-lpc2378/ostest/defconfig6
-rw-r--r--nuttx/configs/olimex-stm32-p107/nsh/defconfig38
-rw-r--r--nuttx/configs/olimex-stm32-p107/ostest/defconfig38
-rwxr-xr-xnuttx/configs/olimex-strp711/nettest/defconfig10
-rw-r--r--nuttx/configs/olimex-strp711/nsh/defconfig10
-rw-r--r--nuttx/configs/olimex-strp711/ostest/defconfig10
-rw-r--r--nuttx/configs/pcblogic-pic32mx/nsh/defconfig4
-rw-r--r--nuttx/configs/pcblogic-pic32mx/ostest/defconfig4
-rw-r--r--nuttx/configs/pic32-starterkit/nsh/defconfig12
-rw-r--r--nuttx/configs/pic32-starterkit/nsh2/defconfig12
-rw-r--r--nuttx/configs/pic32-starterkit/ostest/defconfig12
-rw-r--r--nuttx/configs/pic32mx7mmb/nsh/defconfig12
-rw-r--r--nuttx/configs/pic32mx7mmb/ostest/defconfig12
-rw-r--r--nuttx/configs/qemu-i486/nsh/defconfig10
-rw-r--r--nuttx/configs/qemu-i486/ostest/defconfig2
-rwxr-xr-xnuttx/configs/sam3u-ek/knsh/defconfig12
-rwxr-xr-xnuttx/configs/sam3u-ek/nsh/defconfig12
-rwxr-xr-xnuttx/configs/sam3u-ek/nx/defconfig12
-rwxr-xr-xnuttx/configs/sam3u-ek/ostest/defconfig12
-rwxr-xr-xnuttx/configs/sam3u-ek/touchscreen/defconfig12
-rw-r--r--nuttx/configs/skp16c26/ostest/defconfig8
-rwxr-xr-xnuttx/configs/stm3210e-eval/RIDE/defconfig38
-rw-r--r--nuttx/configs/stm3210e-eval/buttons/defconfig38
-rwxr-xr-xnuttx/configs/stm3210e-eval/composite/defconfig38
-rwxr-xr-xnuttx/configs/stm3210e-eval/nsh/defconfig38
-rw-r--r--nuttx/configs/stm3210e-eval/nsh2/defconfig38
-rw-r--r--nuttx/configs/stm3210e-eval/nx/defconfig38
-rw-r--r--nuttx/configs/stm3210e-eval/nxconsole/defconfig38
-rw-r--r--nuttx/configs/stm3210e-eval/nxlines/defconfig38
-rw-r--r--nuttx/configs/stm3210e-eval/nxtext/defconfig38
-rwxr-xr-xnuttx/configs/stm3210e-eval/ostest/defconfig38
-rw-r--r--nuttx/configs/stm3210e-eval/pm/defconfig38
-rwxr-xr-xnuttx/configs/stm3210e-eval/usbserial/defconfig38
-rwxr-xr-xnuttx/configs/stm3210e-eval/usbstorage/defconfig38
-rw-r--r--nuttx/configs/stm3220g-eval/dhcpd/defconfig38
-rw-r--r--nuttx/configs/stm3220g-eval/nettest/defconfig38
-rw-r--r--nuttx/configs/stm3220g-eval/nsh/defconfig38
-rw-r--r--nuttx/configs/stm3220g-eval/nsh2/defconfig38
-rw-r--r--nuttx/configs/stm3220g-eval/nxwm/defconfig38
-rw-r--r--nuttx/configs/stm3220g-eval/ostest/defconfig38
-rw-r--r--nuttx/configs/stm3220g-eval/telnetd/defconfig38
-rw-r--r--nuttx/configs/stm3240g-eval/dhcpd/defconfig38
-rw-r--r--nuttx/configs/stm3240g-eval/nettest/defconfig38
-rw-r--r--nuttx/configs/stm3240g-eval/nsh/defconfig38
-rw-r--r--nuttx/configs/stm3240g-eval/nsh2/defconfig38
-rw-r--r--nuttx/configs/stm3240g-eval/nxconsole/defconfig38
-rw-r--r--nuttx/configs/stm3240g-eval/nxwm/defconfig38
-rw-r--r--nuttx/configs/stm3240g-eval/ostest/defconfig38
-rw-r--r--nuttx/configs/stm3240g-eval/telnetd/defconfig38
-rw-r--r--nuttx/configs/stm3240g-eval/webserver/defconfig38
-rw-r--r--nuttx/configs/stm32f4discovery/nsh/defconfig38
-rw-r--r--nuttx/configs/stm32f4discovery/nxlines/defconfig38
-rw-r--r--nuttx/configs/stm32f4discovery/ostest/defconfig38
-rw-r--r--nuttx/configs/stm32f4discovery/pm/defconfig38
-rw-r--r--nuttx/configs/sure-pic32mx/nsh/defconfig4
-rw-r--r--nuttx/configs/sure-pic32mx/ostest/defconfig4
-rw-r--r--nuttx/configs/sure-pic32mx/usbnsh/defconfig4
-rw-r--r--nuttx/configs/teensy/hello/defconfig2
-rwxr-xr-xnuttx/configs/teensy/nsh/defconfig2
-rwxr-xr-xnuttx/configs/teensy/usbstorage/defconfig2
-rw-r--r--nuttx/configs/twr-k60n512/nsh/defconfig2
-rw-r--r--nuttx/configs/twr-k60n512/ostest/defconfig2
-rw-r--r--nuttx/configs/ubw32/nsh/defconfig4
-rw-r--r--nuttx/configs/ubw32/ostest/defconfig4
-rw-r--r--nuttx/configs/us7032evb1/nsh/defconfig6
-rw-r--r--nuttx/configs/us7032evb1/ostest/defconfig6
-rwxr-xr-xnuttx/configs/vsn/nsh/defconfig38
-rw-r--r--nuttx/configs/z16f2800100zcog/ostest/defconfig4
-rw-r--r--nuttx/configs/z16f2800100zcog/pashello/defconfig4
-rw-r--r--nuttx/configs/z8encore000zco/ostest/defconfig4
-rw-r--r--nuttx/configs/z8f64200100kit/ostest/defconfig4
-rw-r--r--nuttx/sched/Kconfig4
171 files changed, 1304 insertions, 1304 deletions
diff --git a/nuttx/Kconfig b/nuttx/Kconfig
index 7a8ba9bf2..7c85401c4 100644
--- a/nuttx/Kconfig
+++ b/nuttx/Kconfig
@@ -16,7 +16,7 @@ config NUTTX_NEWCONFIG
bool
default y
-menu "General Setup"
+menu "Build Setup"
config EXPERIMENTAL
bool "Prompt for development and/or incomplete code/drivers"
@@ -258,7 +258,7 @@ menu "Board Selection"
source "configs/Kconfig"
endmenu
-menu "Kernel Features"
+menu "RTOS Features"
source sched/Kconfig
endmenu
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig
index bf7c59c11..c3130864c 100644
--- a/nuttx/arch/arm/src/stm32/Kconfig
+++ b/nuttx/arch/arm/src/stm32/Kconfig
@@ -1591,52 +1591,52 @@ endmenu
menu "UART4 Configuration"
depends on STM32_UART4
-config USART4_SERIAL_CONSOLE
+config UART4_SERIAL_CONSOLE
bool "UART4 serial console"
default y if !STM32_USART1 && !STM32_USART2 && !STM32_USART3
---help---
Selects the UART4 for the console and ttys0 (default is the USART1).
-config USART4_RXBUFSIZE
+config UART4_RXBUFSIZE
int "UART4 Rx buffer size"
default 256
---help---
Characters are buffered as received. This specific the size of the receive
buffer.
-config USART4_TXBUFSIZE
+config UART4_TXBUFSIZE
int "UART4 Tx buffer size"
default 256
---help---
Characters are buffered before being sent. This specific the size of the
transmit buffer
-config USART4_BAUD
+config UART4_BAUD
int "UART4 BAUD"
default 11520
---help---
The configured BAUD of the UART
-config USART4_BITS
+config UART4_BITS
int "UART4 number of bits"
default 8
---help---
The number of bits. Must be either 7 or 8.
-config USART4_PARITY
+config UART4_PARITY
int "UART4 parity"
default 0
---help---
0=no parity, 1=odd parity, 2=even parity
-config USART4_2STOP
+config UART4_2STOP
bool "UART4 two stop bits"
default n
---help---
Two stop bits
-config USART4_RXDMA
- bool "USART4 Rx DMA"
+config UART4_RXDMA
+ bool "UART4 Rx DMA"
default n
depends on STM32_STM32F40XX && ARCH_DMA && STM32_DMA1
---help---
@@ -1647,52 +1647,52 @@ endmenu
menu "UART5 Configuration"
depends on STM32_UART5
-config USART5_SERIAL_CONSOLE
+config UART5_SERIAL_CONSOLE
bool "UART5 serial console"
default y if !STM32_USART1 && !STM32_USART2 && !STM32_USART3 && !STM32_UART4
---help---
Selects the UART5 for the console and ttys0 (default is the USART1).
-config USART5_RXBUFSIZE
- int "USART5 Rx buffer size"
+config UART5_RXBUFSIZE
+ int "UART5 Rx buffer size"
default 256
---help---
Characters are buffered as received. This specific the size of the receive
buffer.
-config USART5_TXBUFSIZE
+config UART5_TXBUFSIZE
int "UART5 Tx buffer size"
default 256
---help---
Characters are buffered before being sent. This specific the size of the
transmit buffer
-config USART5_BAUD
+config UART5_BAUD
int "UART5 BAUD"
default 11520
---help---
The configured BAUD of the UART
-config USART5_BITS
+config UART5_BITS
int "UART5 number of bits"
default 8
---help---
The number of bits. Must be either 7 or 8.
-config USART5_PARITY
+config UART5_PARITY
int "UART5 parity"
default 0
---help---
0=no parity, 1=odd parity, 2=even parity
-config USART5_2STOP
+config UART5_2STOP
bool "UART5 two stop bits"
default n
---help---
Two stop bits
-config USART5_RXDMA
- bool "USART5 Rx DMA"
+config UART5_RXDMA
+ bool "UART5 Rx DMA"
default n
depends on STM32_STM32F40XX && ARCH_DMA && STM32_DMA1
---help---
diff --git a/nuttx/arch/arm/src/stm32/stm32_lowputc.c b/nuttx/arch/arm/src/stm32/stm32_lowputc.c
index 14f4efae4..7f7205672 100644
--- a/nuttx/arch/arm/src/stm32/stm32_lowputc.c
+++ b/nuttx/arch/arm/src/stm32/stm32_lowputc.c
@@ -85,22 +85,22 @@
# define STM32_CONSOLE_2STOP CONFIG_USART3_2STOP
# define STM32_CONSOLE_TX GPIO_USART3_TX
# define STM32_CONSOLE_RX GPIO_USART3_RX
-#elif defined(CONFIG_USART4_SERIAL_CONSOLE)
+#elif defined(CONFIG_UART4_SERIAL_CONSOLE)
# define STM32_CONSOLE_BASE STM32_UART4_BASE
# define STM32_APBCLOCK STM32_PCLK1_FREQUENCY
-# define STM32_CONSOLE_BAUD CONFIG_USART4_BAUD
-# define STM32_CONSOLE_BITS CONFIG_USART4_BITS
-# define STM32_CONSOLE_PARITY CONFIG_USART4_PARITY
-# define STM32_CONSOLE_2STOP CONFIG_USART4_2STOP
+# define STM32_CONSOLE_BAUD CONFIG_UART4_BAUD
+# define STM32_CONSOLE_BITS CONFIG_UART4_BITS
+# define STM32_CONSOLE_PARITY CONFIG_UART4_PARITY
+# define STM32_CONSOLE_2STOP CONFIG_UART4_2STOP
# define STM32_CONSOLE_TX GPIO_UART4_TX
# define STM32_CONSOLE_RX GPIO_UART4_RX
-#elif defined(CONFIG_USART5_SERIAL_CONSOLE)
+#elif defined(CONFIG_UART5_SERIAL_CONSOLE)
# define STM32_CONSOLE_BASE STM32_UART5_BASE
# define STM32_APBCLOCK STM32_PCLK1_FREQUENCY
-# define STM32_CONSOLE_BAUD CONFIG_USART5_BAUD
-# define STM32_CONSOLE_BITS CONFIG_USART5_BITS
-# define STM32_CONSOLE_PARITY CONFIG_USART5_PARITY
-# define STM32_CONSOLE_2STOP CONFIG_USART5_2STOP
+# define STM32_CONSOLE_BAUD CONFIG_UART5_BAUD
+# define STM32_CONSOLE_BITS CONFIG_UART5_BITS
+# define STM32_CONSOLE_PARITY CONFIG_UART5_PARITY
+# define STM32_CONSOLE_2STOP CONFIG_UART5_2STOP
# define STM32_CONSOLE_TX GPIO_UART5_TX
# define STM32_CONSOLE_RX GPIO_UART5_RX
#elif defined(CONFIG_USART6_SERIAL_CONSOLE)
diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c
index 265abfbf3..b90e4ee97 100644
--- a/nuttx/arch/arm/src/stm32/stm32_serial.c
+++ b/nuttx/arch/arm/src/stm32/stm32_serial.c
@@ -90,7 +90,7 @@
# endif
# if defined(CONFIG_USART2_RXDMA) || defined(CONFIG_USART3_RXDMA) || \
- defined(CONFIG_USART4_RXDMA) || defined(CONFIG_USART5_RXDMA)
+ defined(CONFIG_UART4_RXDMA) || defined(CONFIG_UART5_RXDMA)
# ifndef CONFIG_STM32_DMA1
# error STM32 USART2/3/4/5 receive DMA requires CONFIG_STM32_DMA1
# endif
@@ -113,11 +113,11 @@
# error "USART3 DMA channel not defined (DMAMAP_USART3_RX)"
# endif
-# if defined(CONFIG_USART4_RXDMA) && !defined(DMAMAP_UART4_RX)
+# if defined(CONFIG_UART4_RXDMA) && !defined(DMAMAP_UART4_RX)
# error "UART4 DMA channel not defined (DMAMAP_UART4_RX)"
# endif
-# if defined(CONFIG_USART5_RXDMA) && !defined(DMAMAP_UART5_RX)
+# if defined(CONFIG_UART5_RXDMA) && !defined(DMAMAP_UART5_RX)
# error "UART5 DMA channel not defined (DMAMAP_UART5_RX)"
# endif
@@ -338,17 +338,17 @@ static char g_usart3rxfifo[RXDMA_BUFFER_SIZE];
#endif
#ifdef CONFIG_STM32_UART4
-static char g_uart4rxbuffer[CONFIG_USART4_RXBUFSIZE];
-static char g_uart4txbuffer[CONFIG_USART4_TXBUFSIZE];
-# ifdef CONFIG_USART4_RXDMA
+static char g_uart4rxbuffer[CONFIG_UART4_RXBUFSIZE];
+static char g_uart4txbuffer[CONFIG_UART4_TXBUFSIZE];
+# ifdef CONFIG_UART4_RXDMA
static char g_uart4rxfifo[RXDMA_BUFFER_SIZE];
# endif
#endif
#ifdef CONFIG_STM32_UART5
-static char g_uart5rxbuffer[CONFIG_USART5_RXBUFSIZE];
-static char g_uart5txbuffer[CONFIG_USART5_TXBUFSIZE];
-# ifdef CONFIG_USART5_RXDMA
+static char g_uart5rxbuffer[CONFIG_UART5_RXBUFSIZE];
+static char g_uart5txbuffer[CONFIG_UART5_TXBUFSIZE];
+# ifdef CONFIG_UART5_RXDMA
static char g_uart5rxfifo[RXDMA_BUFFER_SIZE];
# endif
#endif
@@ -526,15 +526,15 @@ static struct up_dev_s g_uart4priv =
#endif
.recv =
{
- .size = CONFIG_USART4_RXBUFSIZE,
+ .size = CONFIG_UART4_RXBUFSIZE,
.buffer = g_uart4rxbuffer,
},
.xmit =
{
- .size = CONFIG_USART4_TXBUFSIZE,
+ .size = CONFIG_UART4_TXBUFSIZE,
.buffer = g_uart4txbuffer,
},
-#ifdef CONFIG_USART4_RXDMA
+#ifdef CONFIG_UART4_RXDMA
.ops = &g_uart_dma_ops,
#else
.ops = &g_uart_ops,
@@ -543,21 +543,21 @@ static struct up_dev_s g_uart4priv =
},
.irq = STM32_IRQ_UART4,
- .parity = CONFIG_USART4_PARITY,
- .bits = CONFIG_USART4_BITS,
- .stopbits2 = CONFIG_USART4_2STOP,
- .baud = CONFIG_USART4_BAUD,
+ .parity = CONFIG_UART4_PARITY,
+ .bits = CONFIG_UART4_BITS,
+ .stopbits2 = CONFIG_UART4_2STOP,
+ .baud = CONFIG_UART4_BAUD,
.apbclock = STM32_PCLK1_FREQUENCY,
.usartbase = STM32_UART4_BASE,
.tx_gpio = GPIO_UART4_TX,
.rx_gpio = GPIO_UART4_RX,
-#ifdef GPIO_USART4_CTS
+#ifdef GPIO_UART4_CTS
.cts_gpio = GPIO_UART4_CTS,
#endif
-#ifdef GPIO_USART4_RTS
+#ifdef GPIO_UART4_RTS
.rts_gpio = GPIO_UART4_RTS,
#endif
-#ifdef CONFIG_USART4_RXDMA
+#ifdef CONFIG_UART4_RXDMA
.rxdma_channel = DMAMAP_UART4_RX,
.rxfifo = g_uart4rxfifo,
#endif
@@ -577,15 +577,15 @@ static struct up_dev_s g_uart5priv =
#endif
.recv =
{
- .size = CONFIG_USART5_RXBUFSIZE,
+ .size = CONFIG_UART5_RXBUFSIZE,
.buffer = g_uart5rxbuffer,
},
.xmit =
{
- .size = CONFIG_USART5_TXBUFSIZE,
+ .size = CONFIG_UART5_TXBUFSIZE,
.buffer = g_uart5txbuffer,
},
-#ifdef CONFIG_USART5_RXDMA
+#ifdef CONFIG_UART5_RXDMA
.ops = &g_uart_dma_ops,
#else
.ops = &g_uart_ops,
@@ -594,21 +594,21 @@ static struct up_dev_s g_uart5priv =
},
.irq = STM32_IRQ_UART5,
- .parity = CONFIG_USART5_PARITY,
- .bits = CONFIG_USART5_BITS,
- .stopbits2 = CONFIG_USART5_2STOP,
- .baud = CONFIG_USART5_BAUD,
+ .parity = CONFIG_UART5_PARITY,
+ .bits = CONFIG_UART5_BITS,
+ .stopbits2 = CONFIG_UART5_2STOP,
+ .baud = CONFIG_UART5_BAUD,
.apbclock = STM32_PCLK1_FREQUENCY,
.usartbase = STM32_UART5_BASE,
.tx_gpio = GPIO_UART5_TX,
.rx_gpio = GPIO_UART5_RX,
-#ifdef GPIO_USART5_CTS
+#ifdef GPIO_UART5_CTS
.cts_gpio = GPIO_UART5_CTS,
#endif
-#ifdef GPIO_USART5_RTS
+#ifdef GPIO_UART5_RTS
.rts_gpio = GPIO_UART5_RTS,
#endif
-#ifdef CONFIG_USART5_RXDMA
+#ifdef CONFIG_UART5_RXDMA
.rxdma_channel = DMAMAP_UART5_RX,
.rxfifo = g_uart5rxfifo,
#endif
@@ -1898,14 +1898,14 @@ void stm32_serial_dma_poll(void)
}
#endif
-#ifdef CONFIG_USART4_RXDMA
+#ifdef CONFIG_UART4_RXDMA
if (g_uart4priv.rxdma != NULL)
{
up_dma_rxcallback(g_uart4priv.rxdma, 0, &g_uart4priv);
}
#endif
-#ifdef CONFIG_USART5_RXDMA
+#ifdef CONFIG_UART5_RXDMA
if (g_uart5priv.rxdma != NULL)
{
up_dma_rxcallback(g_uart5priv.rxdma, 0, &g_uart5priv);
diff --git a/nuttx/arch/arm/src/stm32/stm32_uart.h b/nuttx/arch/arm/src/stm32/stm32_uart.h
index 42fe9e346..f51265b18 100644
--- a/nuttx/arch/arm/src/stm32/stm32_uart.h
+++ b/nuttx/arch/arm/src/stm32/stm32_uart.h
@@ -84,40 +84,40 @@
#if defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART1)
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
-# undef CONFIG_USART4_SERIAL_CONSOLE
-# undef CONFIG_USART5_SERIAL_CONSOLE
+# undef CONFIG_UART4_SERIAL_CONSOLE
+# undef CONFIG_UART5_SERIAL_CONSOLE
# undef CONFIG_USART6_SERIAL_CONSOLE
# define CONSOLE_UART 1
# define HAVE_CONSOLE 1
#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART2)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
-# undef CONFIG_USART4_SERIAL_CONSOLE
-# undef CONFIG_USART5_SERIAL_CONSOLE
+# undef CONFIG_UART4_SERIAL_CONSOLE
+# undef CONFIG_UART5_SERIAL_CONSOLE
# undef CONFIG_USART6_SERIAL_CONSOLE
# define CONSOLE_UART 2
# define HAVE_CONSOLE 1
#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART3)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
-# undef CONFIG_USART4_SERIAL_CONSOLE
-# undef CONFIG_USART5_SERIAL_CONSOLE
+# undef CONFIG_UART4_SERIAL_CONSOLE
+# undef CONFIG_UART5_SERIAL_CONSOLE
# undef CONFIG_USART6_SERIAL_CONSOLE
# define CONSOLE_UART 3
# define HAVE_CONSOLE 1
-#elif defined(CONFIG_USART4_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART4)
+#elif defined(CONFIG_UART4_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART4)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
-# undef CONFIG_USART5_SERIAL_CONSOLE
+# undef CONFIG_UART5_SERIAL_CONSOLE
# undef CONFIG_USART6_SERIAL_CONSOLE
# define CONSOLE_UART 4
# define HAVE_CONSOLE 1
-#elif defined(CONFIG_USART5_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART5)
+#elif defined(CONFIG_UART5_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART5)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
-# undef CONFIG_USART4_SERIAL_CONSOLE
+# undef CONFIG_UART4_SERIAL_CONSOLE
# undef CONFIG_USART6_SERIAL_CONSOLE
# define CONSOLE_UART 5
# define HAVE_CONSOLE 1
@@ -125,16 +125,16 @@
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
-# undef CONFIG_USART4_SERIAL_CONSOLE
-# undef CONFIG_USART5_SERIAL_CONSOLE
+# undef CONFIG_UART4_SERIAL_CONSOLE
+# undef CONFIG_UART5_SERIAL_CONSOLE
# define CONSOLE_UART 6
# define HAVE_CONSOLE 1
#else
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
-# undef CONFIG_USART4_SERIAL_CONSOLE
-# undef CONFIG_USART5_SERIAL_CONSOLE
+# undef CONFIG_UART4_SERIAL_CONSOLE
+# undef CONFIG_UART5_SERIAL_CONSOLE
# undef CONFIG_USART6_SERIAL_CONSOLE
# define CONSOLE_UART 0
# undef HAVE_CONSOLE
@@ -149,8 +149,8 @@
# undef CONFIG_USART1_RXDMA
# undef CONFIG_USART2_RXDMA
# undef CONFIG_USART3_RXDMA
-# undef CONFIG_USART4_RXDMA
-# undef CONFIG_USART5_RXDMA
+# undef CONFIG_UART4_RXDMA
+# undef CONFIG_UART5_RXDMA
# undef CONFIG_USART6_RXDMA
#endif
@@ -169,11 +169,11 @@
#endif
#ifndef CONFIG_STM32_UART4
-# undef CONFIG_USART4_RXDMA
+# undef CONFIG_UART4_RXDMA
#endif
#ifndef CONFIG_STM32_UART5
-# undef CONFIG_USART5_RXDMA
+# undef CONFIG_UART5_RXDMA
#endif
#ifndef CONFIG_STM32_USART6
@@ -184,8 +184,8 @@
#undef SERIAL_HAVE_DMA
#if defined(CONFIG_USART1_RXDMA) || defined(CONFIG_USART2_RXDMA) || \
- defined(CONFIG_USART3_RXDMA) || defined(CONFIG_USART4_RXDMA) || \
- defined(CONFIG_USART5_RXDMA) || defined(CONFIG_USART6_RXDMA)
+ defined(CONFIG_USART3_RXDMA) || defined(CONFIG_UART4_RXDMA) || \
+ defined(CONFIG_UART5_RXDMA) || defined(CONFIG_USART6_RXDMA)
# define SERIAL_HAVE_DMA 1
#endif
@@ -198,9 +198,9 @@
# undef SERIAL_HAVE_ONLY_DMA
#elif defined(CONFIG_STM32_USART3) && !defined(CONFIG_USART3_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
-#elif defined(CONFIG_STM32_UART4) && !defined(CONFIG_USART4_RXDMA)
+#elif defined(CONFIG_STM32_UART4) && !defined(CONFIG_UART4_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
-#elif defined(CONFIG_STM32_UART5) && !defined(CONFIG_USART5_RXDMA)
+#elif defined(CONFIG_STM32_UART5) && !defined(CONFIG_UART5_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
#elif defined(CONFIG_STM32_USART6) && !defined(CONFIG_USART6_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig
index a6b572825..55b37bd9b 100644
--- a/nuttx/configs/amber/hello/defconfig
+++ b/nuttx/configs/amber/hello/defconfig
@@ -93,7 +93,7 @@ CONFIG_USART0_RXBUFSIZE=256
CONFIG_USART0_BAUD=38400
CONFIG_USART0_BITS=8
CONFIG_USART0_PARITY=0
-CONFIG_USART0_2STOP=0
+CONFIG_USART0_2STOP=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
@@ -101,7 +101,7 @@ CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART1_BAUD=38400
CONFIG_USART1_BITS=8
CONFIG_USART1_PARITY=0
-CONFIG_USART1_2STOP=0
+CONFIG_USART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig
index dbb562eae..bffd38f3d 100755
--- a/nuttx/configs/avr32dev1/nsh/defconfig
+++ b/nuttx/configs/avr32dev1/nsh/defconfig
@@ -125,9 +125,9 @@ CONFIG_USART0_PARITY=0
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
+CONFIG_USART0_2STOP=n
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig
index 6d5aa4d08..b022b25a3 100755
--- a/nuttx/configs/avr32dev1/ostest/defconfig
+++ b/nuttx/configs/avr32dev1/ostest/defconfig
@@ -125,9 +125,9 @@ CONFIG_USART0_PARITY=0
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
+CONFIG_USART0_2STOP=n
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/c5471evm/httpd/defconfig b/nuttx/configs/c5471evm/httpd/defconfig
index 6c48506e6..1b3298f93 100644
--- a/nuttx/configs/c5471evm/httpd/defconfig
+++ b/nuttx/configs/c5471evm/httpd/defconfig
@@ -49,7 +49,7 @@ CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
CONFIG_DRAM_START=0
-CONFIG_DRAM_SIZE=0x11000000
+CONFIG_DRAM_SIZE=285212672
#
# C5471 specific device driver settings
@@ -67,8 +67,8 @@ CONFIG_UART_IRDA_BITS=8
CONFIG_UART_MODEM_BITS=8
CONFIG_UART_IRDA_PARITY=0
CONFIG_UART_MODEM_PARITY=0
-CONFIG_UART_IRDA_2STOP=0
-CONFIG_UART_MODEM_2STOP=0
+CONFIG_UART_IRDA_2STOP=n
+CONFIG_UART_MODEM_2STOP=n
#
# C5471 Ethernet Driver settings
diff --git a/nuttx/configs/c5471evm/nettest/defconfig b/nuttx/configs/c5471evm/nettest/defconfig
index ac1677b8f..8bf39e9d1 100644
--- a/nuttx/configs/c5471evm/nettest/defconfig
+++ b/nuttx/configs/c5471evm/nettest/defconfig
@@ -49,7 +49,7 @@ CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
CONFIG_DRAM_START=0
-CONFIG_DRAM_SIZE=0x11000000
+CONFIG_DRAM_SIZE=285212672
#
# General build options
@@ -75,8 +75,8 @@ CONFIG_UART_IRDA_BITS=8
CONFIG_UART_MODEM_BITS=8
CONFIG_UART_IRDA_PARITY=0
CONFIG_UART_MODEM_PARITY=0
-CONFIG_UART_IRDA_2STOP=0
-CONFIG_UART_MODEM_2STOP=0
+CONFIG_UART_IRDA_2STOP=n
+CONFIG_UART_MODEM_2STOP=n
#
# C5471 Ethernet Driver settings
diff --git a/nuttx/configs/c5471evm/nsh/defconfig b/nuttx/configs/c5471evm/nsh/defconfig
index 88db3508e..d952f9415 100644
--- a/nuttx/configs/c5471evm/nsh/defconfig
+++ b/nuttx/configs/c5471evm/nsh/defconfig
@@ -49,7 +49,7 @@ CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
CONFIG_DRAM_START=0
-CONFIG_DRAM_SIZE=0x11000000
+CONFIG_DRAM_SIZE=285212672
#
# C5471 specific device driver settings
@@ -67,8 +67,8 @@ CONFIG_UART_IRDA_BITS=8
CONFIG_UART_MODEM_BITS=8
CONFIG_UART_IRDA_PARITY=0
CONFIG_UART_MODEM_PARITY=0
-CONFIG_UART_IRDA_2STOP=0
-CONFIG_UART_MODEM_2STOP=0
+CONFIG_UART_IRDA_2STOP=n
+CONFIG_UART_MODEM_2STOP=n
#
# C5471 Ethernet Driver settings
diff --git a/nuttx/configs/c5471evm/ostest/defconfig b/nuttx/configs/c5471evm/ostest/defconfig
index 26ea84264..56bd14bc7 100644
--- a/nuttx/configs/c5471evm/ostest/defconfig
+++ b/nuttx/configs/c5471evm/ostest/defconfig
@@ -49,7 +49,7 @@ CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
CONFIG_DRAM_START=0
-CONFIG_DRAM_SIZE=0x11000000
+CONFIG_DRAM_SIZE=285212672
#
# C5471 specific device driver settings
@@ -67,8 +67,8 @@ CONFIG_UART_IRDA_BITS=8
CONFIG_UART_MODEM_BITS=8
CONFIG_UART_IRDA_PARITY=0
CONFIG_UART_MODEM_PARITY=0
-CONFIG_UART_IRDA_2STOP=0
-CONFIG_UART_MODEM_2STOP=0
+CONFIG_UART_IRDA_2STOP=n
+CONFIG_UART_MODEM_2STOP=n
#
# C5471 Ethernet Driver settings
diff --git a/nuttx/configs/compal_e88/nsh_highram/defconfig b/nuttx/configs/compal_e88/nsh_highram/defconfig
index f1882aff6..a4660ccda 100644
--- a/nuttx/configs/compal_e88/nsh_highram/defconfig
+++ b/nuttx/configs/compal_e88/nsh_highram/defconfig
@@ -49,7 +49,7 @@ CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_ARCH_STACKDUMP=y
CONFIG_DRAM_START=0
-CONFIG_DRAM_SIZE=0x00840000
+CONFIG_DRAM_SIZE=8650752
#
# C5471 specific device driver settings
@@ -68,8 +68,8 @@ CONFIG_UART_IRDA_BITS=8
CONFIG_UART_MODEM_BITS=8
CONFIG_UART_IRDA_PARITY=0
CONFIG_UART_MODEM_PARITY=0
-CONFIG_UART_IRDA_2STOP=0
-CONFIG_UART_MODEM_2STOP=0
+CONFIG_UART_IRDA_2STOP=n
+CONFIG_UART_MODEM_2STOP=n
CONFIG_STDIO_LINE_BUFFER=y
#
diff --git a/nuttx/configs/compal_e99/nsh_compalram/defconfig b/nuttx/configs/compal_e99/nsh_compalram/defconfig
index d06f685ee..4fa607b37 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/defconfig
+++ b/nuttx/configs/compal_e99/nsh_compalram/defconfig
@@ -52,7 +52,7 @@ CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_ARCH_STACKDUMP=y
CONFIG_DRAM_START=0
-CONFIG_DRAM_SIZE=0x00840000
+CONFIG_DRAM_SIZE=8650752
#
# C5471 specific device driver settings
@@ -71,8 +71,8 @@ CONFIG_UART_IRDA_BITS=8
CONFIG_UART_MODEM_BITS=8
CONFIG_UART_IRDA_PARITY=0
CONFIG_UART_MODEM_PARITY=0
-CONFIG_UART_IRDA_2STOP=0
-CONFIG_UART_MODEM_2STOP=0
+CONFIG_UART_IRDA_2STOP=n
+CONFIG_UART_MODEM_2STOP=n
CONFIG_STDIO_LINE_BUFFER=y
#
diff --git a/nuttx/configs/compal_e99/nsh_highram/defconfig b/nuttx/configs/compal_e99/nsh_highram/defconfig
index c221b4e55..752656975 100644
--- a/nuttx/configs/compal_e99/nsh_highram/defconfig
+++ b/nuttx/configs/compal_e99/nsh_highram/defconfig
@@ -52,7 +52,7 @@ CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_ARCH_STACKDUMP=y
CONFIG_DRAM_START=0
-CONFIG_DRAM_SIZE=0x00840000
+CONFIG_DRAM_SIZE=8650752
#
# C5471 specific device driver settings
@@ -71,8 +71,8 @@ CONFIG_UART_IRDA_BITS=8
CONFIG_UART_MODEM_BITS=8
CONFIG_UART_IRDA_PARITY=0
CONFIG_UART_MODEM_PARITY=0
-CONFIG_UART_IRDA_2STOP=0
-CONFIG_UART_MODEM_2STOP=0
+CONFIG_UART_IRDA_2STOP=n
+CONFIG_UART_MODEM_2STOP=n
CONFIG_STDIO_LINE_BUFFER=y
#
diff --git a/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig
index fb2b85d0e..68976ae8c 100755
--- a/nuttx/configs/demo9s12ne64/ostest/defconfig
+++ b/nuttx/configs/demo9s12ne64/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_MCS92S12NEC64=y
CONFIG_ARCH_BOARD="demo9s12ne64"
CONFIG_ARCH_BOARD_DEMOS92S12NEC64=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_NOINTC=y
CONFIG_ARCH_IRQPRIO=n
@@ -77,7 +77,7 @@ CONFIG_SCI0_RXBUFSIZE=32
CONFIG_SCI0_BAUD=115200
CONFIG_SCI0_BITS=8
CONFIG_SCI0_PARITY=0
-CONFIG_SCI0_2STOP=0
+CONFIG_SCI0_2STOP=n
CONFIG_SCI1_SERIAL_CONSOLE=n
CONFIG_SCI1_TXBUFSIZE=32
@@ -85,7 +85,7 @@ CONFIG_SCI1_RXBUFSIZE=32
CONFIG_SCI1_BAUD=115200
CONFIG_SCI1_BITS=8
CONFIG_SCI1_PARITY=0
-CONFIG_SCI1_2STOP=0
+CONFIG_SCI1_2STOP=n
#
# MC9S12NEC64 specific SSI device driver settings
diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig
index 0f26f02b0..4025ce900 100644
--- a/nuttx/configs/ea3131/nsh/defconfig
+++ b/nuttx/configs/ea3131/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LPC3131=y
CONFIG_ARCH_BOARD="ea3131"
CONFIG_ARCH_BOARD_EA3131=y
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x11028000
CONFIG_DRAM_VSTART=0x11028000
CONFIG_ARCH_IRQPRIO=y
@@ -99,7 +99,7 @@ CONFIG_UART_RXBUFSIZE=256
CONFIG_UART_BAUD=115200
CONFIG_UART_BITS=8
CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig
index 7bf95899f..5581e2e88 100644
--- a/nuttx/configs/ea3131/ostest/defconfig
+++ b/nuttx/configs/ea3131/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LPC3131=y
CONFIG_ARCH_BOARD="ea3131"
CONFIG_ARCH_BOARD_EA3131=y
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x11028000
CONFIG_DRAM_VSTART=0x11028000
CONFIG_ARCH_IRQPRIO=y
@@ -99,7 +99,7 @@ CONFIG_UART_RXBUFSIZE=256
CONFIG_UART_BAUD=115200
CONFIG_UART_BITS=8
CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig
index 8bb50a4a4..e609f35e6 100644
--- a/nuttx/configs/ea3131/pgnsh/defconfig
+++ b/nuttx/configs/ea3131/pgnsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LPC3131=y
CONFIG_ARCH_BOARD="ea3131"
CONFIG_ARCH_BOARD_EA3131=y
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x11028000
CONFIG_DRAM_VSTART=0x11028000
CONFIG_ARCH_IRQPRIO=y
@@ -99,7 +99,7 @@ CONFIG_UART_RXBUFSIZE=256
CONFIG_UART_BAUD=115200
CONFIG_UART_BITS=8
CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART_2STOP=n
#
# MP25x Configuration
diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig
index 13adb17ef..017be2404 100644
--- a/nuttx/configs/ea3131/usbserial/defconfig
+++ b/nuttx/configs/ea3131/usbserial/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LPC3131=y
CONFIG_ARCH_BOARD="ea3131"
CONFIG_ARCH_BOARD_EA3131=y
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x11028000
CONFIG_DRAM_VSTART=0x11028000
CONFIG_ARCH_IRQPRIO=y
@@ -99,7 +99,7 @@ CONFIG_UART_RXBUFSIZE=256
CONFIG_UART_BAUD=115200
CONFIG_UART_BITS=8
CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig
index a350502d2..3a04eab37 100644
--- a/nuttx/configs/ea3131/usbstorage/defconfig
+++ b/nuttx/configs/ea3131/usbstorage/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LPC3131=y
CONFIG_ARCH_BOARD="ea3131"
CONFIG_ARCH_BOARD_EA3131=y
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x11028000
CONFIG_DRAM_VSTART=0x11028000
CONFIG_ARCH_IRQPRIO=y
@@ -99,7 +99,7 @@ CONFIG_UART_RXBUFSIZE=256
CONFIG_UART_BAUD=115200
CONFIG_UART_BITS=8
CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ea3152/ostest/defconfig b/nuttx/configs/ea3152/ostest/defconfig
index b239db331..a86ba4bf9 100644
--- a/nuttx/configs/ea3152/ostest/defconfig
+++ b/nuttx/configs/ea3152/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LPC3152=y
CONFIG_ARCH_BOARD="ea3152"
CONFIG_ARCH_BOARD_EA3152=y
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x11028000
CONFIG_DRAM_VSTART=0x11028000
CONFIG_ARCH_IRQPRIO=y
@@ -99,7 +99,7 @@ CONFIG_UART_RXBUFSIZE=256
CONFIG_UART_BAUD=115200
CONFIG_UART_BITS=8
CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART_2STOP=n
#
# General build options
diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig
index 8c0c4516e..a0959b076 100644
--- a/nuttx/configs/eagle100/httpd/defconfig
+++ b/nuttx/configs/eagle100/httpd/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6918=y
CONFIG_ARCH_BOARD="eagle100"
CONFIG_ARCH_BOARD_EAGLE100=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -83,8 +83,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# LM3S6918 specific SSI device driver settings
diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig
index e0aa45e2f..261b2dafe 100644
--- a/nuttx/configs/eagle100/nettest/defconfig
+++ b/nuttx/configs/eagle100/nettest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6918=y
CONFIG_ARCH_BOARD="eagle100"
CONFIG_ARCH_BOARD_EAGLE100=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -83,8 +83,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# LM3S6918 specific SSI device driver settings
diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig
index 9eedda0a9..e5d3608bb 100644
--- a/nuttx/configs/eagle100/nsh/defconfig
+++ b/nuttx/configs/eagle100/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6918=y
CONFIG_ARCH_BOARD="eagle100"
CONFIG_ARCH_BOARD_EAGLE100=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -83,8 +83,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# LM3S6918 specific SSI device driver settings
diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig
index fc5e6a230..10ee50c44 100644
--- a/nuttx/configs/eagle100/nxflat/defconfig
+++ b/nuttx/configs/eagle100/nxflat/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6918=y
CONFIG_ARCH_BOARD="eagle100"
CONFIG_ARCH_BOARD_EAGLE100=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -83,8 +83,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# LM3S6918 specific SSI device driver settings
diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig
index 008b23a45..afccba390 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/configs/eagle100/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6918=y
CONFIG_ARCH_BOARD="eagle100"
CONFIG_ARCH_BOARD_EAGLE100=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -83,8 +83,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# LM3S6918 specific SSI device driver settings
diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig
index 5201bca78..e7b91bc6f 100644
--- a/nuttx/configs/eagle100/thttpd/defconfig
+++ b/nuttx/configs/eagle100/thttpd/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6918=y
CONFIG_ARCH_BOARD="eagle100"
CONFIG_ARCH_BOARD_EAGLE100=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -83,8 +83,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# LM3S6918 specific SSI device driver settings
diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
index 6d24f5ac9..4d9c1c178 100644
--- a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_CHIP_LM3S9B96=y
CONFIG_ARCH_BOARD="ekk-lm3s9b96"
CONFIG_ARCH_BOARD_EKKLM3S9B96=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00018000
+CONFIG_DRAM_SIZE=98304
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -99,9 +99,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# LM3S6B96 specific SSI device driver settings
diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
index 7de2f33ea..daced7360 100644
--- a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
+++ b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_CHIP_LM3S9B96=y
CONFIG_ARCH_BOARD="ekk-lm3s9b96"
CONFIG_ARCH_BOARD_EKKLM3S9B96=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00018000
+CONFIG_DRAM_SIZE=98304
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -99,9 +99,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# LM3S6B96 specific SSI device driver settings
diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig
index 5947962bc..3ecc95f4b 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/defconfig
+++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig
@@ -68,8 +68,8 @@ CONFIG_UART0_BAUD=57600
CONFIG_UART1_BAUD=57600
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# ez80 EMAC
diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
index 64591ad50..c75c62a5a 100644
--- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
@@ -71,8 +71,8 @@ CONFIG_UART0_BITS=0
CONFIG_UART1_BITS=0
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# ez80 EMAC
diff --git a/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig
index bc8c3bb65..4c477713a 100644
--- a/nuttx/configs/ez80f910200zco/httpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/httpd/defconfig
@@ -71,8 +71,8 @@ CONFIG_UART0_BITS=0
CONFIG_UART1_BITS=0
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# ez80 EMAC
diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig
index 0a87a96e2..4b6485635 100644
--- a/nuttx/configs/ez80f910200zco/nettest/defconfig
+++ b/nuttx/configs/ez80f910200zco/nettest/defconfig
@@ -71,8 +71,8 @@ CONFIG_UART0_BITS=0
CONFIG_UART1_BITS=0
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# ez80 EMAC
diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig
index 4066d0ea7..a4fc9cfb0 100644
--- a/nuttx/configs/ez80f910200zco/nsh/defconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/defconfig
@@ -71,8 +71,8 @@ CONFIG_UART0_BITS=0
CONFIG_UART1_BITS=0
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# ez80 EMAC
diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig
index 11bba8dcf..1a375c1ed 100644
--- a/nuttx/configs/ez80f910200zco/ostest/defconfig
+++ b/nuttx/configs/ez80f910200zco/ostest/defconfig
@@ -70,8 +70,8 @@ CONFIG_UART0_BITS=0
CONFIG_UART1_BITS=0
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# ez80 EMAC
diff --git a/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig
index 8ac0dde32..97f8a6433 100644
--- a/nuttx/configs/ez80f910200zco/poll/defconfig
+++ b/nuttx/configs/ez80f910200zco/poll/defconfig
@@ -71,8 +71,8 @@ CONFIG_UART0_BITS=0
CONFIG_UART1_BITS=0
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# ez80 EMAC
diff --git a/nuttx/configs/hymini-stm32v/buttons/defconfig b/nuttx/configs/hymini-stm32v/buttons/defconfig
index fe9629ee4..335d97fa8 100644
--- a/nuttx/configs/hymini-stm32v/buttons/defconfig
+++ b/nuttx/configs/hymini-stm32v/buttons/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103VCT6=y
CONFIG_ARCH_BOARD="hymini-stm32v"
CONFIG_ARCH_BOARD_HYMINI_STM32V=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x0000C000
+CONFIG_DRAM_SIZE=49152
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -116,44 +116,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/hymini-stm32v/nsh/defconfig b/nuttx/configs/hymini-stm32v/nsh/defconfig
index 881e58210..fa0b79e2f 100755
--- a/nuttx/configs/hymini-stm32v/nsh/defconfig
+++ b/nuttx/configs/hymini-stm32v/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103VCT6=y
CONFIG_ARCH_BOARD="hymini-stm32v"
CONFIG_ARCH_BOARD_HYMINI_STM32V=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x0000C000
+CONFIG_DRAM_SIZE=49152
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -114,44 +114,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103V specific SSI device driver settings
diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig
index d30924845..a0c614569 100644
--- a/nuttx/configs/hymini-stm32v/nsh2/defconfig
+++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103VCT6=y
CONFIG_ARCH_BOARD="hymini-stm32v"
CONFIG_ARCH_BOARD_HYMINI_STM32V=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x0000C000
+CONFIG_DRAM_SIZE=49152
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -119,44 +119,44 @@ CONFIG_STM32_TIM3_PARTIAL_REMAP=y
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/hymini-stm32v/nx/defconfig b/nuttx/configs/hymini-stm32v/nx/defconfig
index 16940a2a8..0e05696ce 100644
--- a/nuttx/configs/hymini-stm32v/nx/defconfig
+++ b/nuttx/configs/hymini-stm32v/nx/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103VCT6=y
CONFIG_ARCH_BOARD="hymini-stm32v"
CONFIG_ARCH_BOARD_HYMINI_STM32V=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x0000C000
+CONFIG_DRAM_SIZE=49152
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -114,44 +114,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103V specific SSI device driver settings
diff --git a/nuttx/configs/hymini-stm32v/nxlines/defconfig b/nuttx/configs/hymini-stm32v/nxlines/defconfig
index 9ce18314a..efb37bd3a 100644
--- a/nuttx/configs/hymini-stm32v/nxlines/defconfig
+++ b/nuttx/configs/hymini-stm32v/nxlines/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="hymini-stm32v"
CONFIG_ARCH_BOARD_HYMINI_STM32V=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x0000C000
+CONFIG_DRAM_SIZE=49152
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -118,44 +118,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103V specific SSI device driver settings
diff --git a/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig
index 285fefd9c..1b96eb9c6 100755
--- a/nuttx/configs/hymini-stm32v/usbserial/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="hymini-stm32v"
CONFIG_ARCH_BOARD_HYMINI_STM32V=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x0000C000
+CONFIG_DRAM_SIZE=49152
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -116,44 +116,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103V specific SSI device driver settings
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbstorage/defconfig
index 129a045c4..0ce608691 100755
--- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbstorage/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="hymini-stm32v"
CONFIG_ARCH_BOARD_HYMINI_STM32V=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x0000C000
+CONFIG_DRAM_SIZE=49152
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -115,44 +115,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103V specific SSI device driver settings
diff --git a/nuttx/configs/lincoln60/nsh/defconfig b/nuttx/configs/lincoln60/nsh/defconfig
index 907a86291..4bf6b0bb9 100644
--- a/nuttx/configs/lincoln60/nsh/defconfig
+++ b/nuttx/configs/lincoln60/nsh/defconfig
@@ -128,10 +128,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/lincoln60/ostest/defconfig b/nuttx/configs/lincoln60/ostest/defconfig
index 6d2ad64b7..b713cb0a2 100644
--- a/nuttx/configs/lincoln60/ostest/defconfig
+++ b/nuttx/configs/lincoln60/ostest/defconfig
@@ -134,10 +134,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
index bc8f56ba6..42f44f744 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig
+++ b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6432=y
CONFIG_ARCH_BOARD="lm3s6432-s2e"
CONFIG_ARCH_BOARD_LM3S6432S2E=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -98,9 +98,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# LM3S6432 specific SSI device driver settings
diff --git a/nuttx/configs/lm3s6432-s2e/ostest/defconfig b/nuttx/configs/lm3s6432-s2e/ostest/defconfig
index 78934fbb2..408c01c4c 100644
--- a/nuttx/configs/lm3s6432-s2e/ostest/defconfig
+++ b/nuttx/configs/lm3s6432-s2e/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6432=y
CONFIG_ARCH_BOARD="lm3s6432-s2e"
CONFIG_ARCH_BOARD_LM3S6432S2E=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -98,9 +98,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# LM3S6432 specific SSI device driver settings
diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig
index 46df76a3c..58cfb2b04 100755
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6965=y
CONFIG_ARCH_BOARD="lm3s6965-ek"
CONFIG_ARCH_BOARD_LM3S6965EK=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -98,9 +98,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# LM3S6965 specific SSI device driver settings
diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig
index bad0fe348..d4482f6cc 100755
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6965=y
CONFIG_ARCH_BOARD="lm3s6965-ek"
CONFIG_ARCH_BOARD_LM3S6965EK=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -98,9 +98,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# LM3S6965 specific SSI device driver settings
diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig
index 7346d3389..f44187174 100755
--- a/nuttx/configs/lm3s6965-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S6965=y
CONFIG_ARCH_BOARD="lm3s6965-ek"
CONFIG_ARCH_BOARD_LM3S6965EK=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -98,9 +98,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# LM3S6965 specific SSI device driver settings
diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig
index bc094bcc6..47a54d81c 100755
--- a/nuttx/configs/lm3s8962-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S8962=y
CONFIG_ARCH_BOARD="lm3s8962-ek"
CONFIG_ARCH_BOARD_LM3S8962EK=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -98,9 +98,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# LM3S8962 specific SSI device driver settings
diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig
index 6086e264b..e61d7cb0e 100755
--- a/nuttx/configs/lm3s8962-ek/nx/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nx/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S8962=y
CONFIG_ARCH_BOARD="lm3s8962-ek"
CONFIG_ARCH_BOARD_LM3S8962EK=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -98,9 +98,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# LM3S8962 specific SSI device driver settings
diff --git a/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig
index 2ab568878..44bcd0003 100755
--- a/nuttx/configs/lm3s8962-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_LM3S8962=y
CONFIG_ARCH_BOARD="lm3s8962-ek"
CONFIG_ARCH_BOARD_LM3S8962EK=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -98,9 +98,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# LM3S8962 specific SSI device driver settings
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/defconfig b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
index db3474a4a..9169cd29b 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
@@ -157,10 +157,10 @@ CONFIG_UART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+CONFIG_USART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
#
CONFIG_USART0_RS485MODE=n
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/defconfig b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
index 40af52c5a..520dc23cf 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
@@ -155,10 +155,10 @@ CONFIG_UART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+CONFIG_USART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
#
CONFIG_USART0_RS485MODE=n
diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index 681744b6e..7b6ce7ff2 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -130,10 +130,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
index 718e07131..c9090cbb8 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -130,10 +130,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
index 839eb2c9a..2c6da9661 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -130,10 +130,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
index da6da5948..b000e69d7 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
@@ -130,10 +130,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 8150d89f6..538ecb881 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -130,10 +130,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
index 8d0f34b44..ffe545f6d 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
@@ -130,10 +130,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig
index 79033bcd2..e652747d6 100644
--- a/nuttx/configs/m68332evb/defconfig
+++ b/nuttx/configs/m68332evb/defconfig
@@ -40,7 +40,7 @@ CONFIG_ARCH_M68332=y
CONFIG_ARCH_M68332EVB=y
CONFIG_ARCH_BOARD="m68332evb"
CONFIG_ARCH_BOARD_M68332EVB=y
-CONFIG_DRAM_SIZE=0x003000
+CONFIG_DRAM_SIZE=12288
CONFIG_ARCH_STACKDUMP=y
#
@@ -58,8 +58,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig
index 4d0a0b0d5..80511aabb 100644
--- a/nuttx/configs/mbed/hidkbd/defconfig
+++ b/nuttx/configs/mbed/hidkbd/defconfig
@@ -128,10 +128,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig
index 0d4070293..96f4454bf 100755
--- a/nuttx/configs/mbed/nsh/defconfig
+++ b/nuttx/configs/mbed/nsh/defconfig
@@ -128,10 +128,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/mcu123-lpc214x/composite/defconfig b/nuttx/configs/mcu123-lpc214x/composite/defconfig
index eae7dc791..b73737adc 100644
--- a/nuttx/configs/mcu123-lpc214x/composite/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/composite/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="mcu123-lpc214x"
CONFIG_ARCH_BOARD_MCU123=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_ARCH_LEDS=y
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x40000000
CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_ARCH_STACKDUMP=y
@@ -80,8 +80,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
index 62b870f72..5589c5639 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="mcu123-lpc214x"
CONFIG_ARCH_BOARD_MCU123=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_ARCH_LEDS=y
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x40000000
CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
@@ -80,8 +80,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
index 0a416b7f7..af801923a 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="mcu123-lpc214x"
CONFIG_ARCH_BOARD_MCU123=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_ARCH_LEDS=y
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x40000000
CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
@@ -80,8 +80,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
index 0749c7834..b77aba399 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="mcu123-lpc214x"
CONFIG_ARCH_BOARD_MCU123=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_ARCH_LEDS=y
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x40000000
CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_ARCH_STACKDUMP=y
@@ -80,8 +80,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
index 4b0ce174d..d655829dd 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="mcu123-lpc214x"
CONFIG_ARCH_BOARD_MCU123=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_ARCH_LEDS=y
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x40000000
CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_ARCH_STACKDUMP=y
@@ -80,8 +80,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig
index a76093424..9a43c5fca 100644
--- a/nuttx/configs/micropendous3/hello/defconfig
+++ b/nuttx/configs/micropendous3/hello/defconfig
@@ -96,7 +96,7 @@ CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART1_BAUD=38400
CONFIG_USART1_BITS=8
CONFIG_USART1_PARITY=0
-CONFIG_USART1_2STOP=0
+CONFIG_USART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/mirtoo/nsh/defconfig b/nuttx/configs/mirtoo/nsh/defconfig
index 0ee9cc34e..76cda2488 100644
--- a/nuttx/configs/mirtoo/nsh/defconfig
+++ b/nuttx/configs/mirtoo/nsh/defconfig
@@ -153,8 +153,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/mirtoo/nxffs/defconfig b/nuttx/configs/mirtoo/nxffs/defconfig
index a9dce182b..616f882cd 100644
--- a/nuttx/configs/mirtoo/nxffs/defconfig
+++ b/nuttx/configs/mirtoo/nxffs/defconfig
@@ -153,8 +153,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/mirtoo/ostest/defconfig b/nuttx/configs/mirtoo/ostest/defconfig
index e830aefa0..96eaeb25c 100644
--- a/nuttx/configs/mirtoo/ostest/defconfig
+++ b/nuttx/configs/mirtoo/ostest/defconfig
@@ -145,8 +145,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig
index 668024693..30b5fe868 100644
--- a/nuttx/configs/mx1ads/ostest/defconfig
+++ b/nuttx/configs/mx1ads/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_IMX1=y
CONFIG_ARCH_BOARD="mx1ads"
CONFIG_ARCH_BOARD_MX1ADS=y
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x01000000
+CONFIG_DRAM_SIZE=16777216
CONFIG_DRAM_START=0x08000000
CONFIG_DRAM_VSTART=0x00000000
CONFIG_DRAM_NUTTXENTRY=0x01004000
@@ -80,9 +80,9 @@ CONFIG_UART3_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# IMX specific SPI device driver settings
diff --git a/nuttx/configs/ne64badge/ostest/defconfig b/nuttx/configs/ne64badge/ostest/defconfig
index 709467d83..bbf41583f 100755
--- a/nuttx/configs/ne64badge/ostest/defconfig
+++ b/nuttx/configs/ne64badge/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_MCS92S12NEC64=y
CONFIG_ARCH_BOARD="ne64badge"
CONFIG_ARCH_BOARD_NE64BADGE=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_NOINTC=y
CONFIG_ARCH_IRQPRIO=n
@@ -83,7 +83,7 @@ CONFIG_SCI0_RXBUFSIZE=32
CONFIG_SCI0_BAUD=38400
CONFIG_SCI0_BITS=8
CONFIG_SCI0_PARITY=0
-CONFIG_SCI0_2STOP=0
+CONFIG_SCI0_2STOP=n
CONFIG_SCI1_SERIAL_CONSOLE=n
CONFIG_SCI1_TXBUFSIZE=32
@@ -91,7 +91,7 @@ CONFIG_SCI1_RXBUFSIZE=32
CONFIG_SCI1_BAUD=38400
CONFIG_SCI1_BITS=8
CONFIG_SCI1_PARITY=0
-CONFIG_SCI1_2STOP=0
+CONFIG_SCI1_2STOP=n
#
# MC9S12NEC64 specific SSI device driver settings
diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig
index ce80f13cb..fbab35a7a 100644
--- a/nuttx/configs/ntosd-dm320/nettest/defconfig
+++ b/nuttx/configs/ntosd-dm320/nettest/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320"
CONFIG_ARCH_BOARD_NTOSD_DM320=y
CONFIG_ARCH_NTOSD_DEVBOARD=n
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x02000000
+CONFIG_DRAM_SIZE=33554432
CONFIG_DRAM_START=0x01100000
CONFIG_DRAM_VSTART=0x00000000
CONFIG_ARCH_INTERRUPTSTACK=0
@@ -79,8 +79,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig
index b6116fb2c..436d324f9 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320"
CONFIG_ARCH_BOARD_NTOSD_DM320=y
CONFIG_ARCH_NTOSD_DEVBOARD=n
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x02000000
+CONFIG_DRAM_SIZE=33554432
CONFIG_DRAM_START=0x01100000
CONFIG_DRAM_VSTART=0x00000000
CONFIG_ARCH_INTERRUPTSTACK=0
@@ -78,8 +78,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig
index 3f59be636..aa4449b0a 100644
--- a/nuttx/configs/ntosd-dm320/ostest/defconfig
+++ b/nuttx/configs/ntosd-dm320/ostest/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320"
CONFIG_ARCH_BOARD_NTOSD_DM320=y
CONFIG_ARCH_NTOSD_DEVBOARD=n
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x02000000
+CONFIG_DRAM_SIZE=33554432
CONFIG_DRAM_START=0x01100000
CONFIG_DRAM_VSTART=0x00000000
CONFIG_ARCH_INTERRUPTSTACK=0
@@ -79,8 +79,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig
index ba70d3244..f004093e4 100644
--- a/nuttx/configs/ntosd-dm320/poll/defconfig
+++ b/nuttx/configs/ntosd-dm320/poll/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320"
CONFIG_ARCH_BOARD_NTOSD_DM320=y
CONFIG_ARCH_NTOSD_DEVBOARD=n
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x02000000
+CONFIG_DRAM_SIZE=33554432
CONFIG_DRAM_START=0x01100000
CONFIG_DRAM_VSTART=0x00000000
CONFIG_ARCH_INTERRUPTSTACK=0
@@ -79,8 +79,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ntosd-dm320/thttpd/defconfig b/nuttx/configs/ntosd-dm320/thttpd/defconfig
index 27b0097b9..f0749ba2f 100644
--- a/nuttx/configs/ntosd-dm320/thttpd/defconfig
+++ b/nuttx/configs/ntosd-dm320/thttpd/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320"
CONFIG_ARCH_BOARD_NTOSD_DM320=y
CONFIG_ARCH_NTOSD_DEVBOARD=n
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x02000000
+CONFIG_DRAM_SIZE=33554432
CONFIG_DRAM_START=0x01100000
CONFIG_DRAM_VSTART=0x00000000
CONFIG_ARCH_INTERRUPTSTACK=0
@@ -79,8 +79,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig
index e1174a13c..e88fedcd5 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/configs/ntosd-dm320/udp/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320"
CONFIG_ARCH_BOARD_NTOSD_DM320=y
CONFIG_ARCH_NTOSD_DEVBOARD=n
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x02000000
+CONFIG_DRAM_SIZE=33554432
CONFIG_DRAM_START=0x01100000
CONFIG_DRAM_VSTART=0x00000000
CONFIG_ARCH_INTERRUPTSTACK=0
@@ -79,8 +79,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig
index 63e21a93e..9c5f0f0d1 100644
--- a/nuttx/configs/ntosd-dm320/uip/defconfig
+++ b/nuttx/configs/ntosd-dm320/uip/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320"
CONFIG_ARCH_BOARD_NTOSD_DM320=y
CONFIG_ARCH_NTOSD_DEVBOARD=n
CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DRAM_SIZE=0x02000000
+CONFIG_DRAM_SIZE=33554432
CONFIG_DRAM_START=0x01100000
CONFIG_DRAM_VSTART=0x00000000
CONFIG_ARCH_INTERRUPTSTACK=0
@@ -79,8 +79,8 @@ CONFIG_UART0_BITS=8
CONFIG_UART1_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig
index d846e9a0d..afb2f8854 100755
--- a/nuttx/configs/nucleus2g/nsh/defconfig
+++ b/nuttx/configs/nucleus2g/nsh/defconfig
@@ -128,10 +128,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig
index 194c5d817..71254a7b0 100755
--- a/nuttx/configs/nucleus2g/ostest/defconfig
+++ b/nuttx/configs/nucleus2g/ostest/defconfig
@@ -128,10 +128,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig
index d3c8bc7dc..08d5c46bb 100755
--- a/nuttx/configs/nucleus2g/usbserial/defconfig
+++ b/nuttx/configs/nucleus2g/usbserial/defconfig
@@ -128,10 +128,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbstorage/defconfig
index 2f1f6a369..469c6faa2 100755
--- a/nuttx/configs/nucleus2g/usbstorage/defconfig
+++ b/nuttx/configs/nucleus2g/usbstorage/defconfig
@@ -128,10 +128,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
index c11d40999..95b6cdc7e 100755
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -134,10 +134,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
index ce40fc25d..5989708e2 100755
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -134,10 +134,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
index 7c0046b85..cf1c642bf 100755
--- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
@@ -134,10 +134,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
index 9bc96d1be..ce73f6b1a 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
@@ -134,10 +134,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
index 409671377..986e08ada 100755
--- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
@@ -134,10 +134,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
index f7b701cc3..68793fcce 100755
--- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
@@ -134,10 +134,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
index 6eb34db14..c358fef59 100755
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -136,10 +136,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
index 9690f800f..bd8fd19c2 100755
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -134,10 +134,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
index ed41b08d0..0fe27df98 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -134,10 +134,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
index b01e79a5d..caf2e3772 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -134,10 +134,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
index a0e5da662..02847d6b4 100755
--- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
@@ -128,10 +128,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# LPC17xx specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/olimex-lpc2378/nsh/defconfig b/nuttx/configs/olimex-lpc2378/nsh/defconfig
index 542492715..2615f35a9 100755
--- a/nuttx/configs/olimex-lpc2378/nsh/defconfig
+++ b/nuttx/configs/olimex-lpc2378/nsh/defconfig
@@ -50,7 +50,7 @@ CONFIG_ARCH_BOARD_OLIMEXLPC2378=y
CONFIG_ARCH_IRQPRIO=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_ARCH_LEDS=y
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x40000000
CONFIG_ARCH_INTERRUPTSTACK=
CONFIG_ARCH_STACKDUMP=y
@@ -101,8 +101,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART2_PARITY=0
# 2 Stop Bits ?
-CONFIG_UART0_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/olimex-lpc2378/ostest/defconfig b/nuttx/configs/olimex-lpc2378/ostest/defconfig
index ef883dfaa..7e0b862f0 100755
--- a/nuttx/configs/olimex-lpc2378/ostest/defconfig
+++ b/nuttx/configs/olimex-lpc2378/ostest/defconfig
@@ -50,7 +50,7 @@ CONFIG_ARCH_BOARD_OLIMEXLPC2378=y
CONFIG_ARCH_IRQPRIO=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_ARCH_LEDS=y
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x40000000
CONFIG_ARCH_INTERRUPTSTACK=
CONFIG_ARCH_STACKDUMP=y
@@ -101,8 +101,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART2_PARITY=0
# 2 Stop Bits ?
-CONFIG_UART0_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/olimex-stm32-p107/nsh/defconfig b/nuttx/configs/olimex-stm32-p107/nsh/defconfig
index b38fd35a8..fc3b4f0c4 100644
--- a/nuttx/configs/olimex-stm32-p107/nsh/defconfig
+++ b/nuttx/configs/olimex-stm32-p107/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F107VC=y
CONFIG_ARCH_BOARD="olimex-stm32-p107"
CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
CONFIG_ARCH_IRQPRIO=y
@@ -144,44 +144,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/olimex-stm32-p107/ostest/defconfig b/nuttx/configs/olimex-stm32-p107/ostest/defconfig
index c51b52c14..a6268b8bc 100644
--- a/nuttx/configs/olimex-stm32-p107/ostest/defconfig
+++ b/nuttx/configs/olimex-stm32-p107/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F107VC=y
CONFIG_ARCH_BOARD="olimex-stm32-p107"
CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
CONFIG_ARCH_IRQPRIO=y
@@ -146,44 +146,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig
index d0df26adf..58a4673e4 100755
--- a/nuttx/configs/olimex-strp711/nettest/defconfig
+++ b/nuttx/configs/olimex-strp711/nettest/defconfig
@@ -47,7 +47,7 @@ CONFIG_ARCH_IRQPRIO=y
CONFIG_BOARD_LOOPSPERMSEC=1431
CONFIG_ARCH_LEDS=y
CONFIG_ARCH_BUTTONS=y
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
@@ -117,10 +117,10 @@ CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# General build options
diff --git a/nuttx/configs/olimex-strp711/nsh/defconfig b/nuttx/configs/olimex-strp711/nsh/defconfig
index 84db85567..8b74e88db 100644
--- a/nuttx/configs/olimex-strp711/nsh/defconfig
+++ b/nuttx/configs/olimex-strp711/nsh/defconfig
@@ -47,7 +47,7 @@ CONFIG_ARCH_IRQPRIO=y
CONFIG_BOARD_LOOPSPERMSEC=1431
CONFIG_ARCH_LEDS=y
CONFIG_ARCH_BUTTONS=y
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
@@ -117,10 +117,10 @@ CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# General build options
diff --git a/nuttx/configs/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig
index cada293a9..ecb201106 100644
--- a/nuttx/configs/olimex-strp711/ostest/defconfig
+++ b/nuttx/configs/olimex-strp711/ostest/defconfig
@@ -47,7 +47,7 @@ CONFIG_ARCH_IRQPRIO=y
CONFIG_BOARD_LOOPSPERMSEC=1431
CONFIG_ARCH_LEDS=y
CONFIG_ARCH_BUTTONS=y
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
@@ -117,10 +117,10 @@ CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# General build options
diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
index e79efc67a..3015f0af6 100644
--- a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
@@ -145,8 +145,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
index 0fe51f08e..668adab78 100644
--- a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
+++ b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
@@ -145,8 +145,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig
index fe18e1dbd..7997282e8 100644
--- a/nuttx/configs/pic32-starterkit/nsh/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh/defconfig
@@ -180,12 +180,12 @@ CONFIG_UART4_PARITY=0
CONFIG_UART5_PARITY=0
CONFIG_UART6_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
-CONFIG_UART4_2STOP=0
-CONFIG_UART5_2STOP=0
-CONFIG_UART6_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
+CONFIG_UART6_2STOP=n
#
# PIC32MX specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig
index 1879e80da..797f2e82b 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig
@@ -180,12 +180,12 @@ CONFIG_UART4_PARITY=0
CONFIG_UART5_PARITY=0
CONFIG_UART6_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
-CONFIG_UART4_2STOP=0
-CONFIG_UART5_2STOP=0
-CONFIG_UART6_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
+CONFIG_UART6_2STOP=n
#
# PIC32MX specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig
index bd1c372ed..510d1e370 100644
--- a/nuttx/configs/pic32-starterkit/ostest/defconfig
+++ b/nuttx/configs/pic32-starterkit/ostest/defconfig
@@ -180,12 +180,12 @@ CONFIG_UART4_PARITY=0
CONFIG_UART5_PARITY=0
CONFIG_UART6_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
-CONFIG_UART4_2STOP=0
-CONFIG_UART5_2STOP=0
-CONFIG_UART6_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
+CONFIG_UART6_2STOP=n
#
# PIC32MX specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig
index 3a89bca7e..eac9a5270 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/defconfig
+++ b/nuttx/configs/pic32mx7mmb/nsh/defconfig
@@ -180,12 +180,12 @@ CONFIG_UART4_PARITY=0
CONFIG_UART5_PARITY=0
CONFIG_UART6_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
-CONFIG_UART4_2STOP=0
-CONFIG_UART5_2STOP=0
-CONFIG_UART6_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
+CONFIG_UART6_2STOP=n
#
# PIC32MX specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/pic32mx7mmb/ostest/defconfig b/nuttx/configs/pic32mx7mmb/ostest/defconfig
index bc307e44a..163d6b455 100644
--- a/nuttx/configs/pic32mx7mmb/ostest/defconfig
+++ b/nuttx/configs/pic32mx7mmb/ostest/defconfig
@@ -180,12 +180,12 @@ CONFIG_UART4_PARITY=0
CONFIG_UART5_PARITY=0
CONFIG_UART6_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
-CONFIG_UART4_2STOP=0
-CONFIG_UART5_2STOP=0
-CONFIG_UART6_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
+CONFIG_UART6_2STOP=n
#
# PIC32MX specific PHY/Ethernet device driver settings
diff --git a/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig
index 34475e69a..96a74839b 100644
--- a/nuttx/configs/qemu-i486/nsh/defconfig
+++ b/nuttx/configs/qemu-i486/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_QEMU=y
CONFIG_ARCH_BOARD="qemu-i486"
CONFIG_ARCH_BOARD_QEMU_I486=y
CONFIG_BOARD_LOOPSPERMSEC=999
-CONFIG_DRAM_SIZE=0x00100000
+CONFIG_DRAM_SIZE=1048576
CONFIG_DRAM_START=0x00100000
CONFIG_ARCH_NOINTC=n
CONFIG_ARCH_STACKDUMP=y
@@ -111,10 +111,10 @@ CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART3_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
+CONFIG_UART3_2STOP=n
#
# General OS setup
diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig
index 7372d3480..cd59503a1 100644
--- a/nuttx/configs/qemu-i486/ostest/defconfig
+++ b/nuttx/configs/qemu-i486/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_QEMU=y
CONFIG_ARCH_BOARD="qemu-i486"
CONFIG_ARCH_BOARD_QEMU_I486=y
CONFIG_BOARD_LOOPSPERMSEC=999
-CONFIG_DRAM_SIZE=0x00100000
+CONFIG_DRAM_SIZE=1048576
CONFIG_DRAM_START=0x00100000
CONFIG_ARCH_NOINTC=n
CONFIG_ARCH_STACKDUMP=y
diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig
index 07088cf31..2c43581f5 100755
--- a/nuttx/configs/sam3u-ek/knsh/defconfig
+++ b/nuttx/configs/sam3u-ek/knsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_AT91SAM3U4E=y
CONFIG_ARCH_BOARD="sam3u-ek"
CONFIG_ARCH_BOARD_SAM3UEK=y
CONFIG_BOARD_LOOPSPERMSEC=4768
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -131,11 +131,11 @@ CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_UART_2STOP=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+CONFIG_UART_2STOP=n
+CONFIG_USART0_2STOP=n
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
#
# General build options
diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig
index 51d7a4a3e..57572fe00 100755
--- a/nuttx/configs/sam3u-ek/nsh/defconfig
+++ b/nuttx/configs/sam3u-ek/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_AT91SAM3U4E=y
CONFIG_ARCH_BOARD="sam3u-ek"
CONFIG_ARCH_BOARD_SAM3UEK=y
CONFIG_BOARD_LOOPSPERMSEC=4768
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -126,11 +126,11 @@ CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_UART_2STOP=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+CONFIG_UART_2STOP=n
+CONFIG_USART0_2STOP=n
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
#
# General build options
diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig
index 386225647..6ce5597e4 100755
--- a/nuttx/configs/sam3u-ek/nx/defconfig
+++ b/nuttx/configs/sam3u-ek/nx/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_AT91SAM3U4E=y
CONFIG_ARCH_BOARD="sam3u-ek"
CONFIG_ARCH_BOARD_SAM3UEK=y
CONFIG_BOARD_LOOPSPERMSEC=4768
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -126,11 +126,11 @@ CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_UART_2STOP=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+CONFIG_UART_2STOP=n
+CONFIG_USART0_2STOP=n
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
#
# General build options
diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig
index f8b8eb264..65b91d0fe 100755
--- a/nuttx/configs/sam3u-ek/ostest/defconfig
+++ b/nuttx/configs/sam3u-ek/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_AT91SAM3U4E=y
CONFIG_ARCH_BOARD="sam3u-ek"
CONFIG_ARCH_BOARD_SAM3UEK=y
CONFIG_BOARD_LOOPSPERMSEC=4768
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -127,11 +127,11 @@ CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_UART_2STOP=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+CONFIG_UART_2STOP=n
+CONFIG_USART0_2STOP=n
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
#
# General build options
diff --git a/nuttx/configs/sam3u-ek/touchscreen/defconfig b/nuttx/configs/sam3u-ek/touchscreen/defconfig
index b1a33fd86..894012e7f 100755
--- a/nuttx/configs/sam3u-ek/touchscreen/defconfig
+++ b/nuttx/configs/sam3u-ek/touchscreen/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_AT91SAM3U4E=y
CONFIG_ARCH_BOARD="sam3u-ek"
CONFIG_ARCH_BOARD_SAM3UEK=y
CONFIG_BOARD_LOOPSPERMSEC=4768
-CONFIG_DRAM_SIZE=0x00008000
+CONFIG_DRAM_SIZE=32768
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -127,11 +127,11 @@ CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_UART_2STOP=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+CONFIG_UART_2STOP=n
+CONFIG_USART0_2STOP=n
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
#
# Input device configuration
diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig
index c0ab37c7c..72fc5a446 100644
--- a/nuttx/configs/skp16c26/ostest/defconfig
+++ b/nuttx/configs/skp16c26/ostest/defconfig
@@ -45,7 +45,7 @@ CONFIG_ARCH_BOARD="skp16c26"
CONFIG_ARCH_BOARD_SKP16C26=y
CONFIG_ARCH_NOINTC=y
CONFIG_ENDIAN_BIG=y
-CONFIG_DRAM_SIZE=0x00800
+CONFIG_DRAM_SIZE=2048
CONFIG_DRAM_START=0x00400
CONFIG_BOARD_LOOPSPERMSEC=16945
CONFIG_ARCH_INTERRUPTSTACK=128
@@ -78,9 +78,9 @@ CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# Enable LCD console
diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig
index db01c2da5..5282c6213 100755
--- a/nuttx/configs/stm3210e-eval/RIDE/defconfig
+++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -112,44 +112,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/buttons/defconfig b/nuttx/configs/stm3210e-eval/buttons/defconfig
index 8bc0e934e..b0b616a25 100644
--- a/nuttx/configs/stm3210e-eval/buttons/defconfig
+++ b/nuttx/configs/stm3210e-eval/buttons/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -123,44 +123,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig
index 6839e15aa..4db468622 100755
--- a/nuttx/configs/stm3210e-eval/composite/defconfig
+++ b/nuttx/configs/stm3210e-eval/composite/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -121,44 +121,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig
index 56d2af420..5ce350e9e 100755
--- a/nuttx/configs/stm3210e-eval/nsh/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -121,44 +121,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig
index 93dbef8a3..2c202e0d8 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -142,44 +142,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig
index cee087a6c..e6aacd817 100644
--- a/nuttx/configs/stm3210e-eval/nx/defconfig
+++ b/nuttx/configs/stm3210e-eval/nx/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -121,44 +121,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/nxconsole/defconfig b/nuttx/configs/stm3210e-eval/nxconsole/defconfig
index 5af0985e6..adc83a1f5 100644
--- a/nuttx/configs/stm3210e-eval/nxconsole/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxconsole/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -121,44 +121,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig
index a1e377559..607e11d3c 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -121,44 +121,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig
index d5669cdd2..2a6f26be4 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -121,44 +121,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig
index f9d777ebd..6a08daf43 100755
--- a/nuttx/configs/stm3210e-eval/ostest/defconfig
+++ b/nuttx/configs/stm3210e-eval/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -122,44 +122,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig
index dc5b27cd5..5e3c47658 100644
--- a/nuttx/configs/stm3210e-eval/pm/defconfig
+++ b/nuttx/configs/stm3210e-eval/pm/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -152,44 +152,44 @@ CONFIG_RTC_ALARM=y
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig
index fef61f6df..3ae6b228d 100755
--- a/nuttx/configs/stm3210e-eval/usbserial/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -122,44 +122,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
index 2ab5ed782..7e804e1a4 100755
--- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F103ZET6=y
CONFIG_ARCH_BOARD="stm3210e-eval"
CONFIG_ARCH_BOARD_STM3210E_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -121,44 +121,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/stm3220g-eval/dhcpd/defconfig b/nuttx/configs/stm3220g-eval/dhcpd/defconfig
index d7d3c8aa9..18bfda2d7 100644
--- a/nuttx/configs/stm3220g-eval/dhcpd/defconfig
+++ b/nuttx/configs/stm3220g-eval/dhcpd/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F207IG=y
CONFIG_ARCH_BOARD="stm3220g-eval"
CONFIG_ARCH_BOARD_STM3220G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=10926
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -144,44 +144,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F20xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3220g-eval/nettest/defconfig b/nuttx/configs/stm3220g-eval/nettest/defconfig
index 44e9cf7cd..367e2a14f 100644
--- a/nuttx/configs/stm3220g-eval/nettest/defconfig
+++ b/nuttx/configs/stm3220g-eval/nettest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F207IG=y
CONFIG_ARCH_BOARD="stm3220g-eval"
CONFIG_ARCH_BOARD_STM3220G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=10926
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -144,44 +144,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F20xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig
index f40dffeeb..2ea6b73cf 100644
--- a/nuttx/configs/stm3220g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F207IG=y
CONFIG_ARCH_BOARD="stm3220g-eval"
CONFIG_ARCH_BOARD_STM3220G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=10926
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -144,44 +144,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F20xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig
index 522840f22..bbf63a10d 100644
--- a/nuttx/configs/stm3220g-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh2/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F207IG=y
CONFIG_ARCH_BOARD="stm3220g-eval"
CONFIG_ARCH_BOARD_STM3220G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=10926
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -144,44 +144,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F20xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig
index f3ef33377..6978255fd 100644
--- a/nuttx/configs/stm3220g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F207IG=y
CONFIG_ARCH_BOARD="stm3220g-eval"
CONFIG_ARCH_BOARD_STM3220G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=10926
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -144,44 +144,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F20xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3220g-eval/ostest/defconfig b/nuttx/configs/stm3220g-eval/ostest/defconfig
index 35e52507c..87741f950 100644
--- a/nuttx/configs/stm3220g-eval/ostest/defconfig
+++ b/nuttx/configs/stm3220g-eval/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F207IG=y
CONFIG_ARCH_BOARD="stm3220g-eval"
CONFIG_ARCH_BOARD_STM3220G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=10926
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -144,44 +144,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F20xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3220g-eval/telnetd/defconfig b/nuttx/configs/stm3220g-eval/telnetd/defconfig
index 0b3f35077..f40108f09 100644
--- a/nuttx/configs/stm3220g-eval/telnetd/defconfig
+++ b/nuttx/configs/stm3220g-eval/telnetd/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F207IG=y
CONFIG_ARCH_BOARD="stm3220g-eval"
CONFIG_ARCH_BOARD_STM3220G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=10926
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -144,44 +144,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F20xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
index e79f774df..0b5b17448 100644
--- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig
+++ b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_BOARD="stm3240g-eval"
CONFIG_ARCH_BOARD_STM3240G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -150,44 +150,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3240g-eval/nettest/defconfig b/nuttx/configs/stm3240g-eval/nettest/defconfig
index d4ba400ce..027b47029 100644
--- a/nuttx/configs/stm3240g-eval/nettest/defconfig
+++ b/nuttx/configs/stm3240g-eval/nettest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_BOARD="stm3240g-eval"
CONFIG_ARCH_BOARD_STM3240G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -150,44 +150,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig
index eab1cef66..fbafb988a 100644
--- a/nuttx/configs/stm3240g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_BOARD="stm3240g-eval"
CONFIG_ARCH_BOARD_STM3240G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -150,44 +150,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3240g-eval/nsh2/defconfig b/nuttx/configs/stm3240g-eval/nsh2/defconfig
index b06ae45b7..f78e7f94f 100644
--- a/nuttx/configs/stm3240g-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh2/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_BOARD="stm3240g-eval"
CONFIG_ARCH_BOARD_STM3240G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -151,44 +151,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
index 36273579f..acc8da70e 100644
--- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_BOARD="stm3240g-eval"
CONFIG_ARCH_BOARD_STM3240G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -150,44 +150,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index 2e8bceb10..5920872c3 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_BOARD="stm3240g-eval"
CONFIG_ARCH_BOARD_STM3240G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -150,44 +150,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3240g-eval/ostest/defconfig b/nuttx/configs/stm3240g-eval/ostest/defconfig
index e4bc6923b..9e2c809fe 100644
--- a/nuttx/configs/stm3240g-eval/ostest/defconfig
+++ b/nuttx/configs/stm3240g-eval/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_BOARD="stm3240g-eval"
CONFIG_ARCH_BOARD_STM3240G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -150,44 +150,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3240g-eval/telnetd/defconfig b/nuttx/configs/stm3240g-eval/telnetd/defconfig
index 5de905c04..400d372b1 100644
--- a/nuttx/configs/stm3240g-eval/telnetd/defconfig
+++ b/nuttx/configs/stm3240g-eval/telnetd/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_BOARD="stm3240g-eval"
CONFIG_ARCH_BOARD_STM3240G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -150,44 +150,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm3240g-eval/webserver/defconfig b/nuttx/configs/stm3240g-eval/webserver/defconfig
index 0a625f93f..6885b8d7b 100644
--- a/nuttx/configs/stm3240g-eval/webserver/defconfig
+++ b/nuttx/configs/stm3240g-eval/webserver/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_BOARD="stm3240g-eval"
CONFIG_ARCH_BOARD_STM3240G_EVAL=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -150,44 +150,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig
index 47e4aeca6..5445b5526 100644
--- a/nuttx/configs/stm32f4discovery/nsh/defconfig
+++ b/nuttx/configs/stm32f4discovery/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y
CONFIG_ARCH_BOARD="stm32f4discovery"
CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -139,44 +139,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SPI device driver settings
diff --git a/nuttx/configs/stm32f4discovery/nxlines/defconfig b/nuttx/configs/stm32f4discovery/nxlines/defconfig
index b57d72be1..019769eee 100644
--- a/nuttx/configs/stm32f4discovery/nxlines/defconfig
+++ b/nuttx/configs/stm32f4discovery/nxlines/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y
CONFIG_ARCH_BOARD="stm32f4discovery"
CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -139,44 +139,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SPI device driver settings
diff --git a/nuttx/configs/stm32f4discovery/ostest/defconfig b/nuttx/configs/stm32f4discovery/ostest/defconfig
index 0ff024904..6fe0a9b8d 100644
--- a/nuttx/configs/stm32f4discovery/ostest/defconfig
+++ b/nuttx/configs/stm32f4discovery/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y
CONFIG_ARCH_BOARD="stm32f4discovery"
CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -139,44 +139,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SSI device driver settings
diff --git a/nuttx/configs/stm32f4discovery/pm/defconfig b/nuttx/configs/stm32f4discovery/pm/defconfig
index 699994947..88890708a 100644
--- a/nuttx/configs/stm32f4discovery/pm/defconfig
+++ b/nuttx/configs/stm32f4discovery/pm/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y
CONFIG_ARCH_BOARD="stm32f4discovery"
CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DRAM_SIZE=0x00030000
+CONFIG_DRAM_SIZE=196608
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_FPU=n
@@ -140,44 +140,44 @@ CONFIG_STM32_TIM11=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USART4_TXBUFSIZE=128
-CONFIG_USART5_TXBUFSIZE=128
+CONFIG_UART4_TXBUFSIZE=128
+CONFIG_UART5_TXBUFSIZE=128
CONFIG_USART1_RXBUFSIZE=128
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART3_RXBUFSIZE=128
-CONFIG_USART4_RXBUFSIZE=128
-CONFIG_USART5_RXBUFSIZE=128
+CONFIG_UART4_RXBUFSIZE=128
+CONFIG_UART5_RXBUFSIZE=128
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F40xxx specific SPI device driver settings
diff --git a/nuttx/configs/sure-pic32mx/nsh/defconfig b/nuttx/configs/sure-pic32mx/nsh/defconfig
index d52bf5509..00af0957d 100644
--- a/nuttx/configs/sure-pic32mx/nsh/defconfig
+++ b/nuttx/configs/sure-pic32mx/nsh/defconfig
@@ -146,8 +146,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# PIC32MX-specific USB device setup
diff --git a/nuttx/configs/sure-pic32mx/ostest/defconfig b/nuttx/configs/sure-pic32mx/ostest/defconfig
index ce09306f0..d6939a6c0 100644
--- a/nuttx/configs/sure-pic32mx/ostest/defconfig
+++ b/nuttx/configs/sure-pic32mx/ostest/defconfig
@@ -146,8 +146,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/sure-pic32mx/usbnsh/defconfig b/nuttx/configs/sure-pic32mx/usbnsh/defconfig
index 76704a121..622ed5654 100644
--- a/nuttx/configs/sure-pic32mx/usbnsh/defconfig
+++ b/nuttx/configs/sure-pic32mx/usbnsh/defconfig
@@ -146,8 +146,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# PIC32MX-specific USB device setup
diff --git a/nuttx/configs/teensy/hello/defconfig b/nuttx/configs/teensy/hello/defconfig
index aa6135471..d97cd5955 100644
--- a/nuttx/configs/teensy/hello/defconfig
+++ b/nuttx/configs/teensy/hello/defconfig
@@ -96,7 +96,7 @@ CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART1_BAUD=38400
CONFIG_USART1_BITS=8
CONFIG_USART1_PARITY=0
-CONFIG_USART1_2STOP=0
+CONFIG_USART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/teensy/nsh/defconfig b/nuttx/configs/teensy/nsh/defconfig
index 7108d27fe..6313c1314 100755
--- a/nuttx/configs/teensy/nsh/defconfig
+++ b/nuttx/configs/teensy/nsh/defconfig
@@ -96,7 +96,7 @@ CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART1_BAUD=38400
CONFIG_USART1_BITS=8
CONFIG_USART1_PARITY=0
-CONFIG_USART1_2STOP=0
+CONFIG_USART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/teensy/usbstorage/defconfig b/nuttx/configs/teensy/usbstorage/defconfig
index 87931ee24..ad7d13ef6 100755
--- a/nuttx/configs/teensy/usbstorage/defconfig
+++ b/nuttx/configs/teensy/usbstorage/defconfig
@@ -96,7 +96,7 @@ CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART1_BAUD=38400
CONFIG_USART1_BITS=8
CONFIG_USART1_PARITY=0
-CONFIG_USART1_2STOP=0
+CONFIG_USART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/twr-k60n512/nsh/defconfig b/nuttx/configs/twr-k60n512/nsh/defconfig
index d5e491dc2..b9670c398 100644
--- a/nuttx/configs/twr-k60n512/nsh/defconfig
+++ b/nuttx/configs/twr-k60n512/nsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="twr-k60n512"
CONFIG_ARCH_BOARD_TWR_K60N512=y
CONFIG_BOARD_LOOPSPERMSEC=9535
CONFIG_DRAM_START=0x1fff0000
-CONFIG_DRAM_SIZE=0x00020000
+CONFIG_DRAM_SIZE=131072
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
CONFIG_ARCH_STACKDUMP=y
diff --git a/nuttx/configs/twr-k60n512/ostest/defconfig b/nuttx/configs/twr-k60n512/ostest/defconfig
index af92b70b1..5d5b1245c 100644
--- a/nuttx/configs/twr-k60n512/ostest/defconfig
+++ b/nuttx/configs/twr-k60n512/ostest/defconfig
@@ -44,7 +44,7 @@ CONFIG_ARCH_BOARD="twr-k60n512"
CONFIG_ARCH_BOARD_TWR_K60N512=y
CONFIG_BOARD_LOOPSPERMSEC=9535
CONFIG_DRAM_START=0x1fff0000
-CONFIG_DRAM_SIZE=0x00020000
+CONFIG_DRAM_SIZE=131072
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
CONFIG_ARCH_STACKDUMP=y
diff --git a/nuttx/configs/ubw32/nsh/defconfig b/nuttx/configs/ubw32/nsh/defconfig
index c198067df..81129771d 100644
--- a/nuttx/configs/ubw32/nsh/defconfig
+++ b/nuttx/configs/ubw32/nsh/defconfig
@@ -145,8 +145,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/ubw32/ostest/defconfig b/nuttx/configs/ubw32/ostest/defconfig
index dcbdc88ba..b6a1814b9 100644
--- a/nuttx/configs/ubw32/ostest/defconfig
+++ b/nuttx/configs/ubw32/ostest/defconfig
@@ -145,8 +145,8 @@ CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
+CONFIG_UART1_2STOP=n
+CONFIG_UART2_2STOP=n
#
# General build options
diff --git a/nuttx/configs/us7032evb1/nsh/defconfig b/nuttx/configs/us7032evb1/nsh/defconfig
index f685371cb..2cf0b2351 100644
--- a/nuttx/configs/us7032evb1/nsh/defconfig
+++ b/nuttx/configs/us7032evb1/nsh/defconfig
@@ -47,7 +47,7 @@ CONFIG_ARCH_IRQPRIO=y
CONFIG_BOARD_LOOPSPERMSEC=572
CONFIG_ARCH_LEDS=y
CONFIG_ARCH_BUTTONS=y
-CONFIG_DRAM_SIZE=0x0000e000
+CONFIG_DRAM_SIZE=57344
CONFIG_DRAM_START=0x0a002000
CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
@@ -85,8 +85,8 @@ CONFIG_SCI0_BITS=8
CONFIG_SCI1_BITS=8
CONFIG_SCI0_PARITY=0
CONFIG_SCI1_PARITY=0
-CONFIG_SCI0_2STOP=0
-CONFIG_SCI1_2STOP=0
+CONFIG_SCI0_2STOP=n
+CONFIG_SCI1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/us7032evb1/ostest/defconfig b/nuttx/configs/us7032evb1/ostest/defconfig
index 8ecf50ea1..97dc1a6bf 100644
--- a/nuttx/configs/us7032evb1/ostest/defconfig
+++ b/nuttx/configs/us7032evb1/ostest/defconfig
@@ -47,7 +47,7 @@ CONFIG_ARCH_IRQPRIO=y
CONFIG_BOARD_LOOPSPERMSEC=572
CONFIG_ARCH_LEDS=y
CONFIG_ARCH_BUTTONS=y
-CONFIG_DRAM_SIZE=0x0000e000
+CONFIG_DRAM_SIZE=57344
CONFIG_DRAM_START=0x0a002000
CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y
@@ -85,8 +85,8 @@ CONFIG_SCI0_BITS=8
CONFIG_SCI1_BITS=8
CONFIG_SCI0_PARITY=0
CONFIG_SCI1_PARITY=0
-CONFIG_SCI0_2STOP=0
-CONFIG_SCI1_2STOP=0
+CONFIG_SCI0_2STOP=n
+CONFIG_SCI1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig
index 5fbf2c799..9cba2a7df 100755
--- a/nuttx/configs/vsn/nsh/defconfig
+++ b/nuttx/configs/vsn/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y
CONFIG_ARCH_BOARD="vsn"
CONFIG_ARCH_BOARD_VSN=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DRAM_SIZE=0x00010000
+CONFIG_DRAM_SIZE=65536
CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n
@@ -142,44 +142,44 @@ CONFIG_STM32_ADC3=n
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_USART4_SERIAL_CONSOLE=n
-CONFIG_USART5_SERIAL_CONSOLE=n
+CONFIG_UART4_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=n
CONFIG_USART1_TXBUFSIZE=256
CONFIG_USART2_TXBUFSIZE=256
CONFIG_USART3_TXBUFSIZE=256
-CONFIG_USART4_TXBUFSIZE=256
-CONFIG_USART5_TXBUFSIZE=256
+CONFIG_UART4_TXBUFSIZE=256
+CONFIG_UART5_TXBUFSIZE=256
CONFIG_USART1_RXBUFSIZE=256
CONFIG_USART2_RXBUFSIZE=256
CONFIG_USART3_RXBUFSIZE=256
-CONFIG_USART4_RXBUFSIZE=256
-CONFIG_USART5_RXBUFSIZE=256
+CONFIG_UART4_RXBUFSIZE=256
+CONFIG_UART5_RXBUFSIZE=256
CONFIG_USART1_BAUD=115200
CONFIG_USART2_BAUD=115200
CONFIG_USART3_BAUD=115200
-CONFIG_USART4_BAUD=115200
-CONFIG_USART5_BAUD=115200
+CONFIG_UART4_BAUD=115200
+CONFIG_UART5_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART2_BITS=8
CONFIG_USART3_BITS=8
-CONFIG_USART4_BITS=8
-CONFIG_USART5_BITS=8
+CONFIG_UART4_BITS=8
+CONFIG_UART5_BITS=8
CONFIG_USART1_PARITY=0
CONFIG_USART2_PARITY=0
CONFIG_USART3_PARITY=0
-CONFIG_USART4_PARITY=0
-CONFIG_USART5_PARITY=0
-
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_USART4_2STOP=0
-CONFIG_USART5_2STOP=0
+CONFIG_UART4_PARITY=0
+CONFIG_UART5_PARITY=0
+
+CONFIG_USART1_2STOP=n
+CONFIG_USART2_2STOP=n
+CONFIG_USART3_2STOP=n
+CONFIG_UART4_2STOP=n
+CONFIG_UART5_2STOP=n
#
# STM32F103Z specific SSI device driver settings
diff --git a/nuttx/configs/z16f2800100zcog/ostest/defconfig b/nuttx/configs/z16f2800100zcog/ostest/defconfig
index 24e228a4b..65c6f8beb 100644
--- a/nuttx/configs/z16f2800100zcog/ostest/defconfig
+++ b/nuttx/configs/z16f2800100zcog/ostest/defconfig
@@ -64,8 +64,8 @@ CONFIG_UART0_BAUD=57600
CONFIG_UART1_BAUD=57600
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/z16f2800100zcog/pashello/defconfig b/nuttx/configs/z16f2800100zcog/pashello/defconfig
index 95cb6f09b..d45697443 100644
--- a/nuttx/configs/z16f2800100zcog/pashello/defconfig
+++ b/nuttx/configs/z16f2800100zcog/pashello/defconfig
@@ -64,8 +64,8 @@ CONFIG_UART0_BAUD=57600
CONFIG_UART1_BAUD=57600
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig
index c19379097..e5848c63d 100644
--- a/nuttx/configs/z8encore000zco/ostest/defconfig
+++ b/nuttx/configs/z8encore000zco/ostest/defconfig
@@ -62,8 +62,8 @@ CONFIG_UART0_BAUD=57600
CONFIG_UART1_BAUD=57600
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/configs/z8f64200100kit/ostest/defconfig b/nuttx/configs/z8f64200100kit/ostest/defconfig
index 510824723..e6e978b7f 100644
--- a/nuttx/configs/z8f64200100kit/ostest/defconfig
+++ b/nuttx/configs/z8f64200100kit/ostest/defconfig
@@ -62,8 +62,8 @@ CONFIG_UART0_BAUD=57600
CONFIG_UART1_BAUD=57600
CONFIG_UART0_PARITY=0
CONFIG_UART1_PARITY=0
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
+CONFIG_UART0_2STOP=n
+CONFIG_UART1_2STOP=n
#
# General build options
diff --git a/nuttx/sched/Kconfig b/nuttx/sched/Kconfig
index 58d6ead70..02c3ed48a 100644
--- a/nuttx/sched/Kconfig
+++ b/nuttx/sched/Kconfig
@@ -179,7 +179,7 @@ config SCHED_LPWORK
config SCHED_LPWORKPRIORITY
int "Lower priority worker thread priority"
- default 192
+ default 50
depends on SCHED_LPWORK
---help---
The execution priority of the lopwer priority worker thread. Default: 192
@@ -236,7 +236,7 @@ config SCHED_ONEXIT_MAX
number that you require.
config USER_ENTRYPOINT
- string "Appliation entry point"
+ string "Application entry point"
default "user_start"
---help---
The name of the entry point for user applications. For the example