diff --git a/configs/sam3u-ek/README.txt b/configs/sam3u-ek/README.txt
index fbda5d92c7..4f176929bd 100644
--- a/configs/sam3u-ek/README.txt
+++ b/configs/sam3u-ek/README.txt
@@ -317,7 +317,7 @@ SAM3U-EK-specific Configuration Options
     CONFIG_SAM34_HSMCI
     CONFIG_SAM34_NAND
     CONFIG_SAM34_SPI
-    CONFIG_SAM34_UART
+    CONFIG_SAM34_UART0
     CONFIG_SAM34_USART0
     CONFIG_SAM34_USART1
     CONFIG_SAM34_USART2
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index 82bb5d0219..d2f4cc23be 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -112,7 +112,7 @@ CONFIG_ARCH_CHIP_SAM3U=y
 # CONFIG_SAM34_DMA is not set
 # CONFIG_SAM34_NAND is not set
 # CONFIG_SAM34_HSMCI is not set
-CONFIG_SAM34_UART=y
+CONFIG_SAM34_UART0=y
 # CONFIG_SAM34_USART0 is not set
 # CONFIG_SAM34_USART1 is not set
 # CONFIG_SAM34_USART2 is not set
@@ -297,21 +297,21 @@ CONFIG_SDIO_BLOCKSETUP=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
-CONFIG_ARCH_HAVE_UART=y
+CONFIG_ARCH_HAVE_UART0=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
-CONFIG_UART_SERIAL_CONSOLE=y
+CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
-# UART Configuration
+# UART0 Configuration
 #
-CONFIG_UART_RXBUFSIZE=256
-CONFIG_UART_TXBUFSIZE=256
-CONFIG_UART_BAUD=115200
-CONFIG_UART_BITS=8
-CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART0_RXBUFSIZE=256
+CONFIG_UART0_TXBUFSIZE=256
+CONFIG_UART0_BAUD=115200
+CONFIG_UART0_BITS=8
+CONFIG_UART0_PARITY=0
+CONFIG_UART0_2STOP=0
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index ef2475c1bb..de9ba69355 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -80,6 +80,7 @@ CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
+# CONFIG_ARCH_HAVE_FPU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
 
@@ -93,29 +94,55 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 
 #
-# AT91SAM3/SAM4 Configuration Options
+# AT91SAM3/4 Configuration Options
 #
 CONFIG_ARCH_CHIP_AT91SAM3U4E=y
+# CONFIG_ARCH_CHIP_SAM34_NDMACHANC2C is not set
+# CONFIG_ARCH_CHIP_ATSAM4LC2B is not set
+# CONFIG_ARCH_CHIP_ATSAM4LC2A is not set
+# CONFIG_ARCH_CHIP_ATSAM4LC4C is not set
+# CONFIG_ARCH_CHIP_ATSAM4LC4B is not set
+# CONFIG_ARCH_CHIP_ATSAM4LC4A is not set
+# CONFIG_ARCH_CHIP_ATSAM4LS2C is not set
+# CONFIG_ARCH_CHIP_ATSAM4LS2B is not set
+# CONFIG_ARCH_CHIP_ATSAM4LS2A is not set
+# CONFIG_ARCH_CHIP_ATSAM4LS4C is not set
+# CONFIG_ARCH_CHIP_ATSAM4LS4B is not set
+# CONFIG_ARCH_CHIP_ATSAM4LS4A is not set
+# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD32C is not set
+# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD32B is not set
+# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD16C is not set
+# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD16B is not set
+# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SA16C is not set
+# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SA16B is not set
+# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S16C is not set
+# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S16B is not set
+# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S8C is not set
+# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S8B is not set
 CONFIG_ARCH_CHIP_SAM3U=y
+# CONFIG_ARCH_CHIP_SAM4L is not set
+# CONFIG_ARCH_CHIP_SAM4S is not set
 
 #
-# AT91SAM3 Peripheral Support
+# AT91SAM3/4 Peripheral Support
 #
-# CONFIG_SAM34_DMA is not set
-# CONFIG_SAM34_NAND is not set
-# CONFIG_SAM34_HSMCI is not set
-CONFIG_SAM34_UART=y
+# CONFIG_SAM34_SPI is not set
+CONFIG_SAM34_UART0=y
 # CONFIG_SAM34_USART0 is not set
 # CONFIG_SAM34_USART1 is not set
 # CONFIG_SAM34_USART2 is not set
 # CONFIG_SAM34_USART3 is not set
+# CONFIG_SAM34_NAND is not set
+# CONFIG_SAM34_DMA is not set
+# CONFIG_SAM34_WDT is not set
+# CONFIG_SAM34_HSMCI is not set
 
 #
-# AT91SAM3 UART Configuration
+# AT91SAM3/4 USART Configuration
 #
 
 #
-# AT91SAM3 GPIO Interrupt Configuration
+# AT91SAM3/4 GPIO Interrupt Configuration
 #
 # CONFIG_GPIOA_IRQ is not set
 # CONFIG_GPIOB_IRQ is not set
@@ -137,7 +164,8 @@ CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
-# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMFUNCS=y
+# CONFIG_ARCH_RAMFUNCS is not set
 CONFIG_ARCH_HAVE_RAMVECTORS=y
 # CONFIG_ARCH_RAMVECTORS is not set
 
@@ -273,21 +301,25 @@ CONFIG_DEV_NULL=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
-CONFIG_ARCH_HAVE_UART=y
+CONFIG_ARCH_HAVE_UART0=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
-CONFIG_UART_SERIAL_CONSOLE=y
+CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
-# UART Configuration
+# UART0 Configuration
 #
-CONFIG_UART_RXBUFSIZE=256
-CONFIG_UART_TXBUFSIZE=256
-CONFIG_UART_BAUD=115200
-CONFIG_UART_BITS=8
-CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART0_RXBUFSIZE=256
+CONFIG_UART0_TXBUFSIZE=256
+CONFIG_UART0_BAUD=115200
+CONFIG_UART0_BITS=8
+CONFIG_UART0_PARITY=0
+CONFIG_UART0_2STOP=0
+# CONFIG_UART0_IFLOWCONTROL is not set
+# CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
@@ -556,6 +588,7 @@ CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
+CONFIG_NSH_MAXARGUMENTS=6
 CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index 7329bd2a40..d1cf4ebca6 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -104,7 +104,7 @@ CONFIG_ARCH_CHIP_SAM3U=y
 # CONFIG_SAM34_DMA is not set
 # CONFIG_SAM34_NAND is not set
 # CONFIG_SAM34_HSMCI is not set
-CONFIG_SAM34_UART=y
+CONFIG_SAM34_UART0=y
 # CONFIG_SAM34_USART0 is not set
 # CONFIG_SAM34_USART1 is not set
 # CONFIG_SAM34_USART2 is not set
@@ -299,21 +299,21 @@ CONFIG_LCD_LANDSCAPE=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
-CONFIG_ARCH_HAVE_UART=y
+CONFIG_ARCH_HAVE_UART0=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
-CONFIG_UART_SERIAL_CONSOLE=y
+CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
-# UART Configuration
+# UART0 Configuration
 #
-CONFIG_UART_RXBUFSIZE=256
-CONFIG_UART_TXBUFSIZE=256
-CONFIG_UART_BAUD=115200
-CONFIG_UART_BITS=8
-CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART0_RXBUFSIZE=256
+CONFIG_UART0_TXBUFSIZE=256
+CONFIG_UART0_BAUD=115200
+CONFIG_UART0_BITS=8
+CONFIG_UART0_PARITY=0
+CONFIG_UART0_2STOP=0
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
diff --git a/configs/sam3u-ek/ostest/defconfig b/configs/sam3u-ek/ostest/defconfig
index 9152a05289..622ece5de8 100644
--- a/configs/sam3u-ek/ostest/defconfig
+++ b/configs/sam3u-ek/ostest/defconfig
@@ -104,7 +104,7 @@ CONFIG_ARCH_CHIP_SAM3U=y
 # CONFIG_SAM34_DMA is not set
 # CONFIG_SAM34_NAND is not set
 # CONFIG_SAM34_HSMCI is not set
-CONFIG_SAM34_UART=y
+CONFIG_SAM34_UART0=y
 # CONFIG_SAM34_USART0 is not set
 # CONFIG_SAM34_USART1 is not set
 # CONFIG_SAM34_USART2 is not set
@@ -272,20 +272,20 @@ CONFIG_DEV_NULL=y
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
 # CONFIG_16550_UART is not set
-CONFIG_ARCH_HAVE_UART=y
+CONFIG_ARCH_HAVE_UART0=y
 CONFIG_MCU_SERIAL=y
-CONFIG_UART_SERIAL_CONSOLE=y
+CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
-# UART Configuration
+# UART0 Configuration
 #
-CONFIG_UART_RXBUFSIZE=256
-CONFIG_UART_TXBUFSIZE=256
-CONFIG_UART_BAUD=115200
-CONFIG_UART_BITS=8
-CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART0_RXBUFSIZE=256
+CONFIG_UART0_TXBUFSIZE=256
+CONFIG_UART0_BAUD=115200
+CONFIG_UART0_BITS=8
+CONFIG_UART0_PARITY=0
+CONFIG_UART0_2STOP=0
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
diff --git a/configs/sam3u-ek/touchscreen/defconfig b/configs/sam3u-ek/touchscreen/defconfig
index f2d933864f..bc2e2286cd 100644
--- a/configs/sam3u-ek/touchscreen/defconfig
+++ b/configs/sam3u-ek/touchscreen/defconfig
@@ -104,7 +104,7 @@ CONFIG_ARCH_CHIP_SAM3U=y
 # CONFIG_SAM34_DMA is not set
 # CONFIG_SAM34_NAND is not set
 # CONFIG_SAM34_HSMCI is not set
-CONFIG_SAM34_UART=y
+CONFIG_SAM34_UART0=y
 # CONFIG_SAM34_USART0 is not set
 # CONFIG_SAM34_USART1 is not set
 # CONFIG_SAM34_USART2 is not set
@@ -316,21 +316,21 @@ CONFIG_LCD_PORTRAIT=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
-CONFIG_ARCH_HAVE_UART=y
+CONFIG_ARCH_HAVE_UART0=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
-CONFIG_UART_SERIAL_CONSOLE=y
+CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
-# UART Configuration
+# UART0 Configuration
 #
-CONFIG_UART_RXBUFSIZE=256
-CONFIG_UART_TXBUFSIZE=256
-CONFIG_UART_BAUD=115200
-CONFIG_UART_BITS=8
-CONFIG_UART_PARITY=0
-CONFIG_UART_2STOP=0
+CONFIG_UART0_RXBUFSIZE=256
+CONFIG_UART0_TXBUFSIZE=256
+CONFIG_UART0_BAUD=115200
+CONFIG_UART0_BITS=8
+CONFIG_UART0_PARITY=0
+CONFIG_UART0_2STOP=0
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set