diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 8de40fcab5..d83474c9d7 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -61,18 +61,22 @@ CONFIG_16550_REGWIDTH=8
 CONFIG_16550_ADDRWIDTH=16
 CONFIG_16550_SUPRESS_CONFIG=y
 CONFIG_SUPPRESS_SERIAL_INTS=n
+
 CONFIG_16550_UART0=y
 CONFIG_16550_UART0_BASE=0x3f8
 CONFIG_16550_UART0_CLOCK=16000000
 CONFIG_16550_UART0_IRQ=IRQ4
+
 CONFIG_16550_UART1=n
 CONFIG_16550_UART1_BASE=0x2f8
 CONFIG_16550_UART1_CLOCK=16000000
 CONFIG_16550_UART1_IRQ=IRQ3
+
 CONFIG_16550_UART2=n
 CONFIG_16550_UART2_BASE=0x3e8
 CONFIG_16550_UART2_CLOCK=16000000
 CONFIG_16550_UART2_IRQ=IRQ4
+
 CONFIG_16550_UART3=n
 CONFIG_16550_UART3_BASE=0x2e8
 CONFIG_16550_UART3_CLOCK=16000000
@@ -81,40 +85,40 @@ CONFIG_16550_UART3_IRQ=IRQ3
 #
 # Serial device driver settings
 #
-CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_UART1_SERIAL_CONSOLE=n
-CONFIG_UART2_SERIAL_CONSOLE=n
-CONFIG_UART3_SERIAL_CONSOLE=n
+CONFIG_16550_UART0_SERIAL_CONSOLE=y
+CONFIG_16550_UART1_SERIAL_CONSOLE=n
+CONFIG_16550_UART2_SERIAL_CONSOLE=n
+CONFIG_16550_UART3_SERIAL_CONSOLE=n
 
-CONFIG_UART0_TXBUFSIZE=256
-CONFIG_UART1_TXBUFSIZE=256
-CONFIG_UART2_TXBUFSIZE=256
-CONFIG_UART3_TXBUFSIZE=256
+CONFIG_16550_UART0_TXBUFSIZE=256
+CONFIG_16550_UART1_TXBUFSIZE=256
+CONFIG_16550_UART2_TXBUFSIZE=256
+CONFIG_16550_UART3_TXBUFSIZE=256
 
-CONFIG_UART0_RXBUFSIZE=256
-CONFIG_UART1_RXBUFSIZE=256
-CONFIG_UART2_RXBUFSIZE=256
-CONFIG_UART3_RXBUFSIZE=256
+CONFIG_16550_UART0_RXBUFSIZE=256
+CONFIG_16550_UART1_RXBUFSIZE=256
+CONFIG_16550_UART2_RXBUFSIZE=256
+CONFIG_16550_UART3_RXBUFSIZE=256
 
-CONFIG_UART0_BAUD=57600
-CONFIG_UART2_BAUD=57600
-CONFIG_UART3_BAUD=57600
-CONFIG_UART1_BAUD=57600
+CONFIG_16550_UART0_BAUD=57600
+CONFIG_16550_UART2_BAUD=57600
+CONFIG_16550_UART3_BAUD=57600
+CONFIG_16550_UART1_BAUD=57600
 
-CONFIG_UART0_BITS=8
-CONFIG_UART1_BITS=8
-CONFIG_UART2_BITS=8
-CONFIG_UART3_BITS=8
+CONFIG_16550_UART0_BITS=8
+CONFIG_16550_UART1_BITS=8
+CONFIG_16550_UART2_BITS=8
+CONFIG_16550_UART3_BITS=8
 
-CONFIG_UART0_PARITY=0
-CONFIG_UART1_PARITY=0
-CONFIG_UART2_PARITY=0
-CONFIG_UART3_PARITY=0
+CONFIG_16550_UART0_PARITY=0
+CONFIG_16550_UART1_PARITY=0
+CONFIG_16550_UART2_PARITY=0
+CONFIG_16550_UART3_PARITY=0
 
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
+CONFIG_16550_UART0_2STOP=0
+CONFIG_16550_UART1_2STOP=0
+CONFIG_16550_UART2_2STOP=0
+CONFIG_16550_UART3_2STOP=0
 
 #
 # General OS setup