Fixes for serial monitor

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2320 42af7a65-404d-4744-a932-0658087f49c3

2 files changed, 21 insertions, 52 deletions

diff --git a/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig
index 3054b562f..6e2409360 100755
--- a/nuttx/configs/demo9s12ne64/ostest/defconfig
+++ b/nuttx/configs/demo9s12ne64/ostest/defconfig
@@ -71,7 +71,7 @@
 #
 CONFIG_ARCH=hc
 CONFIG_ARCH_HC=y
-CONFIG_ARCH_HC12=y
+CONFIG_ARCH_HCS12=y
 CONFIG_ARCH_CHIP=mc9s12ne64
 CONFIG_ARCH_CHIP_MCS92S12NEC64=y
 CONFIG_ARCH_BOARD=demo9s12ne64
@@ -93,58 +93,27 @@ CONFIG_ARCH_DMA=n
 #
 # MC9S12NEC64 specific serial device driver settings
 #
-# CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
-#   console and ttys0 (default is the UART1).
-# CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+# CONFIG_HCS12_SERIALMON - Indicates that the target systems uses
+#   the Freescale serial bootloader.
+# CONFIG_SCIO_SERIAL_CONSOLE - selects the SCIO for the
+#   console and ttys0 (default is the SCIO).
+# CONFIG_SCIO_RXBUFSIZE - Characters are buffered as received.
 #   This specific the size of the receive buffer
-# CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+# CONFIG_SCIO_TXBUFSIZE - Characters are buffered before
 #   being sent.  This specific the size of the transmit buffer
-# CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
-# CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
-# CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-# CONFIG_UARTn_2STOP - Two stop bits
-#
-CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_UART2_SERIAL_CONSOLE=n
-CONFIG_UART3_SERIAL_CONSOLE=n
-CONFIG_UART4_SERIAL_CONSOLE=n
-CONFIG_UART5_SERIAL_CONSOLE=n
-
-CONFIG_UART1_TXBUFSIZE=256
-CONFIG_UART2_TXBUFSIZE=256
-CONFIG_UART3_TXBUFSIZE=256
-CONFIG_UART4_TXBUFSIZE=256
-CONFIG_UART5_TXBUFSIZE=256
-
-CONFIG_UART1_RXBUFSIZE=256
-CONFIG_UART2_RXBUFSIZE=256
-CONFIG_UART3_RXBUFSIZE=256
-CONFIG_UART4_RXBUFSIZE=256
-CONFIG_UART5_RXBUFSIZE=256
-
-CONFIG_UART1_BAUD=115200
-CONFIG_UART2_BAUD=115200
-CONFIG_UART3_BAUD=115200
-CONFIG_UART4_BAUD=115200
-CONFIG_UART5_BAUD=115200
-
-CONFIG_UART1_BITS=8
-CONFIG_UART2_BITS=8
-CONFIG_UART3_BITS=8
-CONFIG_UART4_BITS=8
-CONFIG_UART5_BITS=8
-
-CONFIG_UART1_PARITY=0
-CONFIG_UART2_PARITY=0
-CONFIG_UART3_PARITY=0
-CONFIG_UART4_PARITY=0
-CONFIG_UART5_PARITY=0
-
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
-CONFIG_UART4_2STOP=0
-CONFIG_UART5_2STOP=0
+# CONFIG_SCIO_BAUD - The configure BAUD of the UART.  Must be
+# CONFIG_SCIO_BITS - The number of bits.  Must be either 7 or 8.
+# CONFIG_SCIO_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+# CONFIG_SCIO_2STOP - Two stop bits
+#
+CONFIG_HCS12_SERIALMON=y
+CONFIG_SCIO_SERIAL_CONSOLE=y
+CONFIG_SCIO_TXBUFSIZE=256
+CONFIG_SCIO_RXBUFSIZE=256
+CONFIG_SCIO_BAUD=115200
+CONFIG_SCIO_BITS=8
+CONFIG_SCIO_PARITY=0
+CONFIG_SCIO_2STOP=0
 
 #
 # MC9S12NEC64 specific SSI device driver settings
diff --git a/nuttx/configs/demo9s12ne64/ostest/ld.script b/nuttx/configs/demo9s12ne64/ostest/ld.script
index e6fa37686..4c7c6ed32 100755
--- a/nuttx/configs/demo9s12ne64/ostest/ld.script
+++ b/nuttx/configs/demo9s12ne64/ostest/ld.script
@@ -43,7 +43,7 @@ MEMORY
     sram (rwx) : ORIGIN = 0x3800, LENGTH = 8K
 }
 
-OUTPUT_ARCH(m68hc12)
+OUTPUT_ARCH(m68hcs12)
 ENTRY(_stext)
 SECTIONS
 {