Fixes for serial monitor

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

9 files changed, 364 insertions, 98 deletions

diff --git a/nuttx/arch/hc/src/Makefile b/nuttx/arch/hc/src/Makefile
index 27816b730..694c15d4c 100755
--- a/nuttx/arch/hc/src/Makefile
+++ b/nuttx/arch/hc/src/Makefile
@@ -40,6 +40,9 @@ ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(CONFIG_ARCH_HC12),y)
 ARCH_SUBDIR	= hc12
 endif
+ifeq ($(CONFIG_ARCH_HCS12),y)
+ARCH_SUBDIR	= hcs12
+endif
 
 ifeq ($(WINTOOL),y)
   NUTTX		= "${shell cygpath -w $(TOPDIR)/nuttx}"
diff --git a/nuttx/arch/hc/src/mc9s12ne64/Make.defs b/nuttx/arch/hc/src/mc9s12ne64/Make.defs
index 7bcad4a9b..330ecc442 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/Make.defs
+++ b/nuttx/arch/hc/src/mc9s12ne64/Make.defs
@@ -38,5 +38,5 @@ HEAD_ASRC	= mc9s12ne64_vectors.S
 CMN_ASRCS	= 
 CMN_CSRCS	= 
 
-CHIP_ASRCS	= mc9s12ne64_start.S
+CHIP_ASRCS	= mc9s12ne64_start.S mc9s12ne64_lowputc.S
 CHIP_CSRCS	= 
diff --git a/nuttx/arch/hc/src/mc9s12ne64/chip.h b/nuttx/arch/hc/src/mc9s12ne64/chip.h
index 0f9afce84..f8f8b0e21 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/chip.h
+++ b/nuttx/arch/hc/src/mc9s12ne64/chip.h
@@ -47,7 +47,7 @@
  * Definitions
  ************************************************************************************/
 
-#define HC12_MODULE_BASE 0x0000\
+#define HCS12_MODULE_BASE 0x0000
 
 /************************************************************************************
  * Public Types
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crg.h b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crg.h
index 40e3b82fe..3731621fb 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crg.h
+++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crg.h
@@ -50,33 +50,33 @@
 

 /* CRG Module Register Offsets */

 

-#define HC12_CRG_SYNR_OFFSET   0x34 /* CRG Synthesizer Register */

-#define HC12_CRG_REFDV_OFFSET  0x35 /* CRG Reference Divider Register */

-#define HC12_CRG_CTFLG_OFFSET  0x36 /* CRG Test Flags Register */

-#define HC12_CRG_CRGFLG_OFFSET 0x37 /* CRG Flags Register */

-#define HC12_CRG_CRGINT_OFFSET 0x38 /* CRG Interrupt Enable Register */

-#define HC12_CRG_CLKSEL_OFFSET 0x39 /* CRG Clock Select Register */

-#define HC12_CRG_PLLCTL_OFFSET 0x3a /* CRG PLL Control Register */

-#define HC12_CRG_RTICTL_OFFSET 0x3b /* CRG RTI Control Register */

-#define HC12_CRG_COPCTL_OFFSET 0x3c /* CRG COP Control Register */

-#define HC12_CRG_FORBYP_OFFSET 0x3d /* CRG Force and Bypass Test Register */

-#define HC12_CRG_CTCTL_OFFSET  0x3e /* CRG Test Control Register */

-#define HC12_CRG_ARMCOP_OFFSET 0x3f /* CRG COP Arm/Timer Reset */

+#define HCS12_CRG_SYNR_OFFSET   0x34 /* CRG Synthesizer Register */

+#define HCS12_CRG_REFDV_OFFSET  0x35 /* CRG Reference Divider Register */

+#define HCS12_CRG_CTFLG_OFFSET  0x36 /* CRG Test Flags Register */

+#define HCS12_CRG_CRGFLG_OFFSET 0x37 /* CRG Flags Register */

+#define HCS12_CRG_CRGINT_OFFSET 0x38 /* CRG Interrupt Enable Register */

+#define HCS12_CRG_CLKSEL_OFFSET 0x39 /* CRG Clock Select Register */

+#define HCS12_CRG_PLLCTL_OFFSET 0x3a /* CRG PLL Control Register */

+#define HCS12_CRG_RTICTL_OFFSET 0x3b /* CRG RTI Control Register */

+#define HCS12_CRG_COPCTL_OFFSET 0x3c /* CRG COP Control Register */

+#define HCS12_CRG_FORBYP_OFFSET 0x3d /* CRG Force and Bypass Test Register */

+#define HCS12_CRG_CTCTL_OFFSET  0x3e /* CRG Test Control Register */

+#define HCS12_CRG_ARMCOP_OFFSET 0x3f /* CRG COP Arm/Timer Reset */

 

 /* CRG Module Register Addresses */

 

-#define HC12_CRG_SYNR          (HC12_MODULE_BASE+HC12_CRG_SYNR_OFFSET)

-#define HC12_CRG_REFDV         (HC12_MODULE_BASE+HC12_CRG_REFDV_OFFSET)

-#define HC12_CRG_CTFLG         (HC12_MODULE_BASE+HC12_CRG_CTFLG_OFFSET)

-#define HC12_CRG_CRGFLG        (HC12_MODULE_BASE+HC12_CRG_CRGFLG_OFFSET)

-#define HC12_CRG_CRGINT        (HC12_MODULE_BASE+HC12_CRG_CRGINT_OFFSET)

-#define HC12_CRG_CLKSEL        (HC12_MODULE_BASE+HC12_CRG_CLKSEL_OFFSET)

-#define HC12_CRG_PLLCTL        (HC12_MODULE_BASE+HC12_CRG_PLLCTL_OFFSET)

-#define HC12_CRG_RTICTL        (HC12_MODULE_BASE+HC12_CRG_RTICTL_OFFSET)

-#define HC12_CRG_COPCTL        (HC12_MODULE_BASE+HC12_CRG_COPCTL_OFFSET)

-#define HC12_CRG_FORBYP        (HC12_MODULE_BASE+HC12_CRG_FORBYP_OFFSET)

-#define HC12_CRG_CTCTL         (HC12_MODULE_BASE+HC12_CRG_CTCTL_OFFSET)

-#define HC12_CRG_ARMCOP        (HC12_MODULE_BASE+HC12_CRG_ARMCOP_OFFSET)

+#define HCS12_CRG_SYNR          (HCS12_MODULE_BASE+HCS12_CRG_SYNR_OFFSET)

+#define HCS12_CRG_REFDV         (HCS12_MODULE_BASE+HCS12_CRG_REFDV_OFFSET)

+#define HCS12_CRG_CTFLG         (HCS12_MODULE_BASE+HCS12_CRG_CTFLG_OFFSET)

+#define HCS12_CRG_CRGFLG        (HCS12_MODULE_BASE+HCS12_CRG_CRGFLG_OFFSET)

+#define HCS12_CRG_CRGINT        (HCS12_MODULE_BASE+HCS12_CRG_CRGINT_OFFSET)

+#define HCS12_CRG_CLKSEL        (HCS12_MODULE_BASE+HCS12_CRG_CLKSEL_OFFSET)

+#define HCS12_CRG_PLLCTL        (HCS12_MODULE_BASE+HCS12_CRG_PLLCTL_OFFSET)

+#define HCS12_CRG_RTICTL        (HCS12_MODULE_BASE+HCS12_CRG_RTICTL_OFFSET)

+#define HCS12_CRG_COPCTL        (HCS12_MODULE_BASE+HCS12_CRG_COPCTL_OFFSET)

+#define HCS12_CRG_FORBYP        (HCS12_MODULE_BASE+HCS12_CRG_FORBYP_OFFSET)

+#define HCS12_CRG_CTCTL         (HCS12_MODULE_BASE+HCS12_CRG_CTCTL_OFFSET)

+#define HCS12_CRG_ARMCOP        (HCS12_MODULE_BASE+HCS12_CRG_ARMCOP_OFFSET)

 

 /* CRG Module Register Bit Definitions */

 

diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h
new file mode 100755
index 000000000..1db25a19b
--- /dev/null
+++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h
@@ -0,0 +1,145 @@
+/************************************************************************************
+ * arch/hc/src/mc9s12ne64/mc9x12ne64_internal.h
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_HC_SRC_MC9S12NE64_MC9S12NE64_INTERNAL_H
+#define __ARCH_HC_SRC_MC9S12NE64_MC9S12NE64_INTERNAL_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+
+#include "up_internal.h"
+#include "chip.h"
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/* Configuration ********************************************************************/
+
+/* User-Accessible utility subroutines provided by the serial monitor */
+
+#define PutChar     0xfee6 /* Sends the character in A out SCI0 */
+#define GetChar     0xfee9 /* Return character received from SCIO in A */
+#define EraseAllCmd 0xfeec /* Erase all flash (except bootloader) */
+#define DoOnStack   0xfeef /* Copy to stack and execute from RAM */
+#define WriteD2IX   0xfef2 /* Write the data in D (word) to the address in IX.
+                            * The location may be RAM, FLASH, EEPROM, or a register */
+
+/************************************************************************************
+ * Inline Functions
+ ************************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+/************************************************************************************
+ * Public Function Prototypes
+ ************************************************************************************/
+
+/************************************************************************************
+ * Function: hcs12_ethinitialize
+ *
+ * Description:
+ *   Initialize the Ethernet driver for one interface.  If the STM32 chip
+ *   supports multiple Ethernet controllers, then bould specific logic
+ *   must implement up_netinitialize() and call this function to initialize
+ *   the desiresed interfaces.
+ *
+ * Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   OK on success; Negated errno on failure.
+ *
+ * Assumptions:
+ *
+ ************************************************************************************/
+
+#if STM32_NTHERNET > 1
+EXTERN int hcs12_ethinitialize(int intf);
+#endif
+
+/************************************************************************************
+ * Name:  hcs12_spiselect and hcs12_spistatus
+ *
+ * Description:
+ *   The external functions, hcs12_spiselect and hcs12_spistatus must be
+ *   provided by board-specific logic.  They are implementations of the select
+ *   and status methods of the SPI interface defined by struct spi_ops_s (see
+ *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   are provided by common STM32 logic.  To use this common SPI logic on your
+ *   board:
+ *
+ *   1. Provide logic in hcs12_boardinitialize() to configure SPI chip select
+ *      pins.
+ *   2. Provide hcs12_spiselect() and hcs12_spistatus() functions in your
+ *      board-specific logic.  These functions will perform chip selection and
+ *      status operations using GPIOs in the way your board is configured.
+ *   3. Add a calls to up_spiinitialize() in your low level application
+ *      initialization logic
+ *   4. The handle returned by up_spiinitialize() may then be used to bind the
+ *      SPI driver to higher level logic (e.g., calling 
+ *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
+ *      the SPI MMC/SD driver).
+ *
+ ************************************************************************************/
+
+struct spi_dev_s;
+enum spi_dev_e;
+EXTERN void  hcs12_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected);
+EXTERN ubyte hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_HC_SRC_MC9S12NE64_MC9S12NE64_INTERNAL_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_lowputc.S b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_lowputc.S
new file mode 100755
index 000000000..05777546c
--- /dev/null
+++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_lowputc.S
@@ -0,0 +1,103 @@
+/**************************************************************************
+ * arch/arm/src/mc9s12ne64/mc9s12ne64_lowputc.S
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
+/**************************************************************************
+ * Included Files
+ **************************************************************************/
+
+#include <nuttx/config.h>
+#include "up_internal.h"
+
+#include "up_arch.h"
+#include "mc9s12ne64_internal.h"
+
+/**************************************************************************
+ * Private Definitions
+ **************************************************************************/
+
+/**************************************************************************
+ * Private Types
+ **************************************************************************/
+
+/**************************************************************************
+ * Private Function Prototypes
+ **************************************************************************/
+
+/**************************************************************************
+ * Global Variables
+ **************************************************************************/
+
+/**************************************************************************
+ * Private Variables
+ **************************************************************************/
+
+/**************************************************************************
+ * Private Functions
+ **************************************************************************/
+
+/**************************************************************************
+ * Public Functions
+ **************************************************************************/
+
+/**************************************************************************
+ * Name: up_lowsetup
+ **************************************************************************/
+
+	.text
+	.globl	up_lowsetup
+	.type	up_lowsetup, function
+up_lowsetup:
+#ifdef CONFIG_HCS12_SERIALMON
+	rts
+#else
+# error "up_lowsetup not implemented"
+#endif
+	.size	up_lowsetup, . - up_lowsetup
+
+/**************************************************************************
+ * Name: up_lowputc
+ **************************************************************************/
+
+	.text
+	.global	up_lowputc
+	.type	up_lowputc, function
+up_lowputc:
+#ifdef CONFIG_HCS12_SERIALMON
+	bra		PutChar
+#else
+# error "up_lowputc not implemented"
+#endif
+	.size	up_lowputc, . - up_lowputc
+	.end
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmc.h b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmc.h
index 12d4f7b17..11ecc2636 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmc.h
+++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmc.h
@@ -50,21 +50,21 @@
 
 /* MMC Sub-block */
 
-#define HC12_MMC_INITRM            0x0010   /* Internal RAM Position Register */
+#define HCS12_MMC_INITRM            0x0010  /* Internal RAM Position Register */
 #  define MMC_INITRM_RAMHAL        (1 << 0) /* Bit 0: RAM High-Align */
 #  define MMC_INITRM_RAM_SHIFT     (3)      /* Bits 3-7: Internal RAM Map Position */
 #  define MMC_INITRM_RAM_MASK      (0x1f << MMC_INITRM_RAM_SHIFT)
 
-#define HC12_MMC_INITRG            0x0011   /* Internal Registers Position Register */
+#define HCS12_MMC_INITRG            0x0011  /* Internal Registers Position Register */
 #  define MMC_INITRG_REG_SHIFT     (3)      /* Bits 3-6: Internal RAM Map Position */
 #  define MMC_INITRG_REG_MASK      (0x0f << MMC_INITRG_REG_SHIFT)
 
-#define HC12_MMC_INITEE            0x0012   /* Internal EEPROM Position Register */
+#define HCS12_MMC_INITEE            0x0012  /* Internal EEPROM Position Register */
 #  define MMC_INITEE_EEON         (1 << 0)  /* Bit 0: Enable EEPROM */
 #  define MMC_INITEE_EE_SHIFT     (3)       /* Bits 3-7: Internal EEPROM Map Position */
 #  define MMC_INITEE_EE_MASK      (0x1f << MMC_INITEE_EE_SHIFT)
 
-#define HC12_MMC_MISC              0x0013   /* Miscellaneous System Control Register */
+#define HCS12_MMC_MISC              0x0013  /* Miscellaneous System Control Register */
 #  define MMC_MISC_ROMON           (1 << 0) /* Bit 0: Enable FLASH EEPROM or ROM */
 #  define MMC_MISC_ROMHM           (1 << 1) /* Bit 1: FLASH EEPROM or ROM Only in Second Half of Memory Map */
 #  define MMC_MISC_EXSTR_SHIFT     (3)      /* Bits 3-7: External Access Stretch Bits */
@@ -74,10 +74,10 @@
 #    define MISC_EXSTR_CLKS2       (2 << MMC_MISC_EXSTR_SHIFT)
 #    define MISC_EXSTR_CLKS3       (3 << MMC_MISC_EXSTR_SHIFT)
 
-#define HC12_MMC_TESTREG0          0x0014   /* Reserved Test Register 0 */
-#define HC12_MMC_TESTREG1          0x0017   /* Reserved Test Register 1 */
+#define HCS12_MMC_TESTREG0          0x0014  /* Reserved Test Register 0 */
+#define HCS12_MMC_TESTREG1          0x0017  /* Reserved Test Register 1 */
 
-#define HC12_MMC_MEMSIZ0           0x001c   /* Memory Size Register 0 */
+#define HCS12_MMC_MEMSIZ0           0x001c  /* Memory Size Register 0 */
 #  define MMC_MEMSIZ0_RAMSW_SHIFT (0)       /* Bits 0-2: Allocated System RAM Memory Space */
 #  define MMC_MEMSIZ0_RAMSW_MASK  (7 << MMC_MEMSIZ0_RAMSW_SHIFT)
 #    define MEMSIZ0_RAMSW_2KB     (0 << MMC_MEMSIZ0_RAMSW_SHIFT)
@@ -96,7 +96,7 @@
 #    define MEMSIZ0_EEPSW_5KB     (3 << MMC_MEMSIZ0_EEPSW_MASK)
 #  define MMC_MEMSIZ0_REGSW       (1 << 7)  /* Bits 7: Allocated System Register Space */
 
-#define HC12_MMC_MEMSIZ1           0x001d   /* Memory Size Register 1 */
+#define HCS12_MMC_MEMSIZ1           0x001d  /* Memory Size Register 1 */
 #  define MMC_MEMSIZ1_PAGSW_SHIFT (0)       /* Bits 0-1: Allocated System RAM Memory Space */
 #  define MMC_MEMSIZ1_PAGSW_MASK  (3 << MMC_MEMSIZ1_PAGSW_SHIFT)
 #    define MEMSIZ1_PAGSW_128KB   (0 << MMC_MEMSIZ1_PAGSW_SHIFT)
@@ -110,7 +110,7 @@
 #    define MEMSIZ1_ROMSW_48KB    (2 << MMC_MEMSIZ1_ROMSW_SHIFT)
 #    define MEMSIZ1_ROMSW_64KB    (3 << MMC_MEMSIZ1_ROMSW_SHIFT)
 
-#define HC12_MMC_PPAGE            0x0030    /* Program Page Index Register */
+#define HCS12_MMC_PPAGE            0x0030   /* Program Page Index Register */
 #  define MMC_PPAGE_PIX_SHIFT     (0)       /* Bits 0-5 Program Page Index Bits 5–0 */
 #  define MMC_PPAGE_PIX_MASK      (0x3f << MMC_PPAGE_PIX_SHIFT)
 
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S
index e12c4a56d..75613d8a8 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S
+++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S
@@ -41,6 +41,7 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 
+#include "mc9s12ne64_internal.h"
 #include "mc9s12ne64_mmc.h"
 #include "mc9s12ne64_crg.h"
 
@@ -60,49 +61,59 @@
  * Macros
  ****************************************************************************/
 
+/* Print a character on the UART to show boot status. This macro will
+ * modify r0, r1, r2 and r14
+ */
+
+	.macro	showprogress, code
+#if defined(CONFIG_DEBUG) && defined(CONFIG_HCS12_SERIALMON)
+	jsr		#PutChar
+#endif
+	.endm
+
 /* Memory map initialization */
 
 	.macro	MMCINIT
-	clr		HC12_MMC_INITRG			/* Set the register map position to 0x0000*/
+	movb	#0x00, HCS12_MMC_INITRG			/* Set the register map position to 0x0000*/
 	nop
 
-	ldab	#0x09
-	stab	*HC12_MMC_INITEE		/* Set EEPROM position to 0x0800 */
-
-#ifdef CONFIG_HC12_SERIALMON
-	ldab	#0x39					/* Set RAM position to 0x3800 */
+#ifdef CONFIG_HCS12_SERIALMON
+	movb	#0x39, HCS12_MMC_INITRM			/* Set RAM position to 0x3800 to end at 0x3fff */
 #else
-	ldab	#0x20					/* Set RAM position to 0x2000*/
+	movb	#0x20, HCS12_MMC_INITRM			/* Set RAM position to 0x2000*/
 #endif
-	stab	*HC12_MMC_INITRM
-	ldaa	#MMC_MISC_ROMON			/* MISC: EXSTR1=0 EXSTR0=0 ROMHM=0 ROMON=1 */
-	staa	*HC12_MMC_MISC		
+
+	movb	#0x09, HCS12_MMC_INITEE			/* Set EEPROM position to 0x0800 */
+	movb	#MMC_MISC_ROMON, HCS12_MMC_MISC	/* MISC: EXSTR1=0 EXSTR0=0 ROMHM=0 ROMON=1 */
 	.endm
 
-/* System clock initialization */
+/* System clock initialization.  If the serial monitor is used, then clocking will have
+ * already been configured at 24 MHz
+ */
 
 	.macro	PLLINIT 
-
+#ifndef CONFIG_HCS12_SERIALMON
 	/* Select the clock source from crystal */
 
-	clr 	HC12_CRG_CLKSEL
+	clr 	HCS12_CRG_CLKSEL
 
 	/* Set the multipler and divider and enable the PLL */
 
-	bclr	*HC12_CRG_PLLCTL #CRG_PLLCTL_PLLON
+	bclr	*HCS12_CRG_PLLCTL #CRG_PLLCTL_PLLON
 	ldab	#15
-	stab	HC12_CRG_SYNR
-	stab	HC12_CRG_REFDV
-	bset	*HC12_CRG_PLLCTL #CRG_PLLCTL_PLLON
+	stab	HCS12_CRG_SYNR
+	stab	HCS12_CRG_REFDV
+	bset	*HCS12_CRG_PLLCTL #CRG_PLLCTL_PLLON
 
 	/* Wait for the PLL to lock on */
 
 .Lpll_lock:
-	brclr	*HC12_CRG_CRGFLG #CRG_CRGFLG_LOCK .Lpll_lock
+	brclr	*HCS12_CRG_CRGFLG #CRG_CRGFLG_LOCK .Lpll_lock
 
 	/* Then select the PLL clock source */
 
-	bset	*HC12_CRG_CLKSEL #CRG_CLKSEL_PLLSEL
+	bset	*HCS12_CRG_CLKSEL #CRG_CLKSEL_PLLSEL
+#endif
 	.endm
 
 
@@ -129,6 +140,7 @@ __start:
 	/* Setup the stack pointer */
 
 	lds		.Lstackbase
+	showprogress 'A'
 
 	/* Clear BSS */
 
@@ -144,6 +156,7 @@ __start:
 	inx								/* Address the next byte */
 	bra 	.Lclearbss				/* And loop until all cleared */
 .Lbsscleared:
+	showprogress 'B'
 
 	/* Initialize the data section */
 
@@ -160,9 +173,11 @@ __start:
 	inx								/* Increment the destination address */
 	bra 	.Linitdata				/* And loop until all of .DATA is initialized */
 .Ldatainitialized:
+	showprogress 'C'
 
 	/* Now, start the OS */
 
+	showprogress '\n'
 	call	os_start
 	bra		__start
 
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_vectors.S b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_vectors.S
index 195cbfccd..47d793ba0 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_vectors.S
+++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_vectors.S
@@ -50,7 +50,7 @@
  ************************************************************************************/
 
 	.globl		__start
-	.file		"mc9shc12ne64_vectors.S"
+	.file		"mc9s12ne64_vectors.S"
 
 /************************************************************************************
  * Macros
@@ -64,12 +64,12 @@
  * Vectors
  ************************************************************************************/
 
-	.section	.vectors, "x"
+	.section	vectors, "x"
 	.align		2
-	.globl		hc12_vectors
-	.type		hc12_vectors, function
+	.globl		hcs12_vectors
+	.type		hcs12_vectors, function
 
-hc12_vectors:
+hcs12_vectors:
 											/* ff80-ff9f: Reserved */
 	.hword		villegal					/* ff80: Reserved*/
 	.hword		villegal					/* ff82: Reserved */
@@ -136,7 +136,7 @@ hc12_vectors:
 	.hword		vclkmon 					/* fffc: Clock monitor fail reset */
 	.hword		__start 					/* fffe: Reset vector */
 
-	.size	hc12_vectors, .-hc12_vectors
+	.size	hcs12_vectors, .-hcs12_vectors
 
 /************************************************************************************
  * .text
@@ -146,44 +146,44 @@ hc12_vectors:
 	.type	handlers, function
 handlers:
 
-	HANDLER vemacec, HC12_IRQ_VEMACEC			/* EMAC excessive collision */
-	HANDLER vemaclc, HC12_IRQ_VEMACLC			/* EMAC late collision */
-	HANDLER vemacbrxerr, HC12_IRQ_VEMACBRXERR	/* EMAC babbling receive error */
-	HANDLER vemacrxbbo, HC12_IRQ_VEMACRXBBO 	/* EMAC receive buffer B overrun */
-	HANDLER vemacrxbao, HC12_IRQ_VEMACRXBAO 	/* EMAC receive buffer A overrun */
-	HANDLER vemacrxerr, HC12_IRQ_VEMACRXERR 	/* EMAC receive error */
-	HANDLER vemacmii, HC12_IRQ_VEMACMII 		/* EMAC MII management transfer complete */
-	HANDLER vemacrxfc, HC12_IRQ_VEMACRXFC		/* EMAC receive flow control */
-	HANDLER vemactxc, HC12_IRQ_VEMACTXC 		/* EMAC frame transmission complete */
-	HANDLER vemaccrxbbc, HC12_IRQ_VEMACCRXBBC	/* EMAC receive buffer B complete */
-	HANDLER vemaccrxbac, HC12_IRQ_VEMACCRXBAC	/* EMAC receive buffer A complete */
-	HANDLER vephy, HC12_IRQ_VEPHY				/* EPHY interrupt */
-	HANDLER vflash, HC12_IRQ_VFLASH 			/* FLASH */
-	HANDLER viic, HC12_IRQ_VIIC 				/* IIC bus */
-	HANDLER vcrgscm, HC12_IRQ_VCRGSCM			/* CRG self clock mode */
-	HANDLER vcrgplllck, HC12_IRQ_VCRGPLLLCK 	/* CRG PLL lock */
-	HANDLER vportg, HC12_IRQ_VPORTG 			/* Port G */
-	HANDLER vporth, HC12_IRQ_VPORTH 			/* Port H */
-	HANDLER vportj, HC12_IRQ_VPORTJ 			/* Port J */
-	HANDLER vatd, HC12_IRQ_VATD 				/* ATD */
-	HANDLER vsci1, HC12_IRQ_VSCI1				/* SCI1 */
-	HANDLER vsci0, HC12_IRQ_VSCI0				/* SCI0 */
-	HANDLER vspi, HC12_IRQ_VSPI 				/* SPI */
-	HANDLER vtimpaie, HC12_IRQ_VTIMPAIE 		/* Pulse accumulator input edge */
-	HANDLER vtimpaovf, HC12_IRQ_VTIMPAOVF		/* Pulse accumulator overflow */
-	HANDLER vtimovf, HC12_IRQ_VTIMOVF			/* Standard timer overflow */
-	HANDLER vtimch7, HC12_IRQ_VTIMCH7			/* Standard timer channel 7 */
-	HANDLER vtimch6, HC12_IRQ_VTIMCH6			/* Standard timer channel 6 */
-	HANDLER vtimch5, HC12_IRQ_VTIMCH5			/* Standard timer channel 5 */
-	HANDLER vtimch4, HC12_IRQ_VTIMCH4			/* Standard timer channel 4 */
-	HANDLER vrti, HC12_IRQ_VRTI 				/* Real-time interrupt */
-	HANDLER virq, HC12_IRQ_VIRQ 				/* IRQ */
-	HANDLER vxirq, HC12_IRQ_VXIRQ				/* XIRQ */
-	HANDLER vswi, HC12_IRQ_VSWI 				/* SWI */
-	HANDLER vtrap, HC12_IRQ_VTRAP				/* Unimplemented instruction trap */
-	HANDLER vcop, HC12_IRQ_VCOP 				/* COP failure reset*/
-	HANDLER vclkmon, HC12_IRQ_VCLKMON			/* Clock monitor fail reset */
-	HANDLER villegal, HC12_IRQ_VILLEGAL 		/* Any reserved vector */
+	HANDLER vemacec, HCS12_IRQ_VEMACEC			/* EMAC excessive collision */
+	HANDLER vemaclc, HCS12_IRQ_VEMACLC			/* EMAC late collision */
+	HANDLER vemacbrxerr, HCS12_IRQ_VEMACBRXERR	/* EMAC babbling receive error */
+	HANDLER vemacrxbbo, HCS12_IRQ_VEMACRXBBO 	/* EMAC receive buffer B overrun */
+	HANDLER vemacrxbao, HCS12_IRQ_VEMACRXBAO 	/* EMAC receive buffer A overrun */
+	HANDLER vemacrxerr, HCS12_IRQ_VEMACRXERR 	/* EMAC receive error */
+	HANDLER vemacmii, HCS12_IRQ_VEMACMII 		/* EMAC MII management transfer complete */
+	HANDLER vemacrxfc, HCS12_IRQ_VEMACRXFC		/* EMAC receive flow control */
+	HANDLER vemactxc, HCS12_IRQ_VEMACTXC 		/* EMAC frame transmission complete */
+	HANDLER vemaccrxbbc, HCS12_IRQ_VEMACCRXBBC	/* EMAC receive buffer B complete */
+	HANDLER vemaccrxbac, HCS12_IRQ_VEMACCRXBAC	/* EMAC receive buffer A complete */
+	HANDLER vephy, HCS12_IRQ_VEPHY				/* EPHY interrupt */
+	HANDLER vflash, HCS12_IRQ_VFLASH 			/* FLASH */
+	HANDLER viic, HCS12_IRQ_VIIC 				/* IIC bus */
+	HANDLER vcrgscm, HCS12_IRQ_VCRGSCM			/* CRG self clock mode */
+	HANDLER vcrgplllck, HCS12_IRQ_VCRGPLLLCK 	/* CRG PLL lock */
+	HANDLER vportg, HCS12_IRQ_VPORTG 			/* Port G */
+	HANDLER vporth, HCS12_IRQ_VPORTH 			/* Port H */
+	HANDLER vportj, HCS12_IRQ_VPORTJ 			/* Port J */
+	HANDLER vatd, HCS12_IRQ_VATD 				/* ATD */
+	HANDLER vsci1, HCS12_IRQ_VSCI1				/* SCI1 */
+	HANDLER vsci0, HCS12_IRQ_VSCI0				/* SCI0 */
+	HANDLER vspi, HCS12_IRQ_VSPI 				/* SPI */
+	HANDLER vtimpaie, HCS12_IRQ_VTIMPAIE 		/* Pulse accumulator input edge */
+	HANDLER vtimpaovf, HCS12_IRQ_VTIMPAOVF		/* Pulse accumulator overflow */
+	HANDLER vtimovf, HCS12_IRQ_VTIMOVF			/* Standard timer overflow */
+	HANDLER vtimch7, HCS12_IRQ_VTIMCH7			/* Standard timer channel 7 */
+	HANDLER vtimch6, HCS12_IRQ_VTIMCH6			/* Standard timer channel 6 */
+	HANDLER vtimch5, HCS12_IRQ_VTIMCH5			/* Standard timer channel 5 */
+	HANDLER vtimch4, HCS12_IRQ_VTIMCH4			/* Standard timer channel 4 */
+	HANDLER vrti, HCS12_IRQ_VRTI 				/* Real-time interrupt */
+	HANDLER virq, HCS12_IRQ_VIRQ 				/* IRQ */
+	HANDLER vxirq, HCS12_IRQ_VXIRQ				/* XIRQ */
+	HANDLER vswi, HCS12_IRQ_VSWI 				/* SWI */
+	HANDLER vtrap, HCS12_IRQ_VTRAP				/* Unimplemented instruction trap */
+	HANDLER vcop, HCS12_IRQ_VCOP 				/* COP failure reset*/
+	HANDLER vclkmon, HCS12_IRQ_VCLKMON			/* Clock monitor fail reset */
+	HANDLER villegal, HCS12_IRQ_VILLEGAL 		/* Any reserved vector */
 
 /************************************************************************************
  *	Common IRQ handling logic