diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 51c8758f6e..ed0cc9ad24 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -6400,7 +6400,7 @@ Mem: 29232 5920 23312 23312
However, testing has not yet begun due to issues with BDMs, Code Warrior, and
the paging in the build process.
Progress is slow, but I hope to see a fully verified MC9S12NE64 port in the near future.
- Refer to the NuttX board README files for DEMO9S12NE64 and for the NE64 /PoE Badge for further information.
+ Refer to the NuttX board README files for DEMO9S12NE64 and for the NE64 /PoE Badge for further information.
diff --git a/Documentation/README.html b/Documentation/README.html
index c671ad2a9c..de2da9748e 100644
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -409,11 +409,11 @@ nuttx/
| | `- moteino-mega/
| | `- README.txt
| |- hc/
- | | `- mcs92s12ne64/
+ | | `- m9s12/
| | |- demo9s12ne64/
- | | |` `- README.txt
+ | | |` `- README.txt
| | `- ne64badge/
- | | `- README.txt
+ | | `- README.txt
| |- mips/
| | |- pic32mx/
| | | |- mirtoo/
diff --git a/README.txt b/README.txt
index 50ac6c74e5..67935838c6 100644
--- a/README.txt
+++ b/README.txt
@@ -2121,7 +2121,7 @@ nuttx/
| | `- moteino-mega/
| | `- README.txt
| |- hc/
- | | `- mcs92s12ne64/
+ | | `- m9s12/
| | |- demo9s12ne64/
| | | `- README.txt
| | `- ne64badge/
diff --git a/boards/Kconfig b/boards/Kconfig
index fc2bf68c05..ab29ab2262 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -2720,10 +2720,10 @@ if ARCH_BOARD_CUSTOM
source "boards/dummy/Kconfig"
endif
if ARCH_BOARD_DEMOS92S12NEC64
-source "boards/hc/mcs92s12ne64/demo9s12ne64/Kconfig"
+source "boards/hc/m9s12/demo9s12ne64/Kconfig"
endif
if ARCH_BOARD_NE64BADGE
-source "boards/hc/mcs92s12ne64/ne64badge/Kconfig"
+source "boards/hc/m9s12/ne64badge/Kconfig"
endif
if ARCH_BOARD_MIRTOO
source "boards/mips/pic32mx/mirtoo/Kconfig"
diff --git a/boards/README.txt b/boards/README.txt
index 47d7781d22..c36b053344 100644
--- a/boards/README.txt
+++ b/boards/README.txt
@@ -218,7 +218,7 @@ boards/arm/stm32/cloudctrl
board. Based on the Shenzhou IV development board design. It is based on
the STM32F107VC MCU.
-boards/hc/mcs92s12ne64/demo9s12ne64
+boards/hc/m9s12/demo9s12ne64
NXP/FreeScale DMO9S12NE64 board based on the MC9S12NE64 hcs12 cpu. This
port uses the m9s12x GCC toolchain. STATUS: (Still) under development; it
is code complete but has not yet been verified.
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/Kconfig b/boards/hc/m9s12/demo9s12ne64/Kconfig
similarity index 100%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/Kconfig
rename to boards/hc/m9s12/demo9s12ne64/Kconfig
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/README.txt b/boards/hc/m9s12/demo9s12ne64/README.txt
similarity index 100%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/README.txt
rename to boards/hc/m9s12/demo9s12ne64/README.txt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/configs/ostest/defconfig b/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig
similarity index 97%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/configs/ostest/defconfig
rename to boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig
index ca6b7a22cb..03355c59ad 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/configs/ostest/defconfig
+++ b/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig
@@ -10,7 +10,7 @@
CONFIG_ARCH="hc"
CONFIG_ARCH_BOARD="demo9s12ne64"
CONFIG_ARCH_BOARD_DEMOS92S12NEC64=y
-CONFIG_ARCH_CHIP="mcs92s12ne64"
+CONFIG_ARCH_CHIP="m9s12"
CONFIG_ARCH_CHIP_MCS92S12NEC64=y
CONFIG_ARCH_HC=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/include/board.h b/boards/hc/m9s12/demo9s12ne64/include/board.h
similarity index 97%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/include/board.h
rename to boards/hc/m9s12/demo9s12ne64/include/board.h
index 6eaed5fb1b..e27d57a8ba 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/include/board.h
+++ b/boards/hc/m9s12/demo9s12ne64/include/board.h
@@ -1,6 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/demo9s12ne64/include/board.h
- * include/arch/board/board.h
+ * boards/hc/m9s12/demo9s12ne64/include/board.h
*
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs b/boards/hc/m9s12/demo9s12ne64/scripts/Make.defs
similarity index 98%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs
rename to boards/hc/m9s12/demo9s12ne64/scripts/Make.defs
index 7d565dfce4..647806c761 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs
+++ b/boards/hc/m9s12/demo9s12ne64/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs
+# boards/hc/m9s12/demo9s12ne64/scripts/Make.defs
#
# Copyright (C) 2009,2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-banked.ld b/boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-banked.ld
similarity index 98%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-banked.ld
rename to boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-banked.ld
index 534cccd3ec..1bc5b01964 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-banked.ld
+++ b/boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-banked.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/demo9s12ne64/ostest/demo9s12ne64-banked.ld
+ * boards/hc/m9s12/demo9s12ne64/ostest/demo9s12ne64-banked.ld
*
* Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld b/boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld
similarity index 98%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld
rename to boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld
index 6ec6e5b74b..d7028fb201 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld
+++ b/boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/demo9s12ne64/ostest/demo9s12ne64-banked.ld
+ * boards/hc/m9s12/demo9s12ne64/ostest/demo9s12ne64-banked.ld
*
* Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/.gitignore b/boards/hc/m9s12/demo9s12ne64/src/.gitignore
similarity index 100%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/.gitignore
rename to boards/hc/m9s12/demo9s12ne64/src/.gitignore
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/Makefile b/boards/hc/m9s12/demo9s12ne64/src/Makefile
similarity index 97%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/Makefile
rename to boards/hc/m9s12/demo9s12ne64/src/Makefile
index c9216a2e71..0f49e55b3d 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/Makefile
+++ b/boards/hc/m9s12/demo9s12ne64/src/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# boards/hc/mcs92s12ne64/demo9s12ne64/src/Makefile
+# boards/hc/m9s12/demo9s12ne64/src/Makefile
#
# Copyright (C) 2009 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/demo9s12ne64.h b/boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h
similarity index 98%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/demo9s12ne64.h
rename to boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h
index 47b0c40257..0dc9ab850e 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/demo9s12ne64.h
+++ b/boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/demo9s12ne64/src/demo9s12ne64.h
+ * boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_appinit.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_appinit.c
similarity index 98%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_appinit.c
rename to boards/hc/m9s12/demo9s12ne64/src/m9s12_appinit.c
index 204662be22..fd6407a7a9 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_appinit.c
+++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_appinit.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_appinit.c
+ * boards/hc/m9s12/demo9s12ne64/src/m9s12_appinit.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_boot.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_boot.c
similarity index 98%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_boot.c
rename to boards/hc/m9s12/demo9s12ne64/src/m9s12_boot.c
index 9004345ea3..c93010164d 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_boot.c
+++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_boot.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_boot.c
+ * boards/hc/m9s12/demo9s12ne64/src/m9s12_boot.c
*
* Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_buttons.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c
similarity index 98%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_buttons.c
rename to boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c
index 8d39e68c0f..deb28ebbab 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_buttons.c
+++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_buttons.c
+ * boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c
*
* Copyright (C) 2009, 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_leds.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_leds.c
similarity index 98%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_leds.c
rename to boards/hc/m9s12/demo9s12ne64/src/m9s12_leds.c
index a185a754d7..c71e09135c 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_leds.c
+++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_leds.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_leds.c
+ * boards/hc/m9s12/demo9s12ne64/src/m9s12_leds.c
*
* Copyright (C) 2009, 2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_spi.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_spi.c
similarity index 98%
rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_spi.c
rename to boards/hc/m9s12/demo9s12ne64/src/m9s12_spi.c
index 6cc74ac330..bbb4287d38 100644
--- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_spi.c
+++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_spi.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64demo9s12ne64/src/m9s12_spi.c
+ * boards/hc/m9s12/demo9s12ne64/src/m9s12_spi.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/drivers/Kconfig b/boards/hc/m9s12/drivers/Kconfig
similarity index 100%
rename from boards/hc/mcs92s12ne64/drivers/Kconfig
rename to boards/hc/m9s12/drivers/Kconfig
diff --git a/boards/hc/mcs92s12ne64/ne64badge/Kconfig b/boards/hc/m9s12/ne64badge/Kconfig
similarity index 100%
rename from boards/hc/mcs92s12ne64/ne64badge/Kconfig
rename to boards/hc/m9s12/ne64badge/Kconfig
diff --git a/boards/hc/mcs92s12ne64/ne64badge/README.txt b/boards/hc/m9s12/ne64badge/README.txt
similarity index 100%
rename from boards/hc/mcs92s12ne64/ne64badge/README.txt
rename to boards/hc/m9s12/ne64badge/README.txt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/configs/ostest/defconfig b/boards/hc/m9s12/ne64badge/configs/ostest/defconfig
similarity index 97%
rename from boards/hc/mcs92s12ne64/ne64badge/configs/ostest/defconfig
rename to boards/hc/m9s12/ne64badge/configs/ostest/defconfig
index ac8e237225..7eb70c84bf 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/configs/ostest/defconfig
+++ b/boards/hc/m9s12/ne64badge/configs/ostest/defconfig
@@ -10,7 +10,7 @@
CONFIG_ARCH="hc"
CONFIG_ARCH_BOARD="ne64badge"
CONFIG_ARCH_BOARD_NE64BADGE=y
-CONFIG_ARCH_CHIP="mcs92s12ne64"
+CONFIG_ARCH_CHIP="m9s12"
CONFIG_ARCH_CHIP_MCS92S12NEC64=y
CONFIG_ARCH_HC=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/hc/mcs92s12ne64/ne64badge/include/board.h b/boards/hc/m9s12/ne64badge/include/board.h
similarity index 98%
rename from boards/hc/mcs92s12ne64/ne64badge/include/board.h
rename to boards/hc/m9s12/ne64badge/include/board.h
index a4d80be103..d638e44108 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/include/board.h
+++ b/boards/hc/m9s12/ne64badge/include/board.h
@@ -1,6 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/ne64badge/include/board.h
- * include/arch/board/board.h
+ * boards/hc/m9s12/ne64badge/include/board.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs b/boards/hc/m9s12/ne64badge/scripts/Make.defs
similarity index 98%
rename from boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs
rename to boards/hc/m9s12/ne64badge/scripts/Make.defs
index a6ccdcd84d..ebf6a19385 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs
+++ b/boards/hc/m9s12/ne64badge/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs
+# boards/hc/m9s12/ne64badge/scripts/Make.defs
#
# Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-banked.ld b/boards/hc/m9s12/ne64badge/scripts/ne64badge-banked.ld
similarity index 98%
rename from boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-banked.ld
rename to boards/hc/m9s12/ne64badge/scripts/ne64badge-banked.ld
index 0b31cfe9ea..e88b32dac4 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-banked.ld
+++ b/boards/hc/m9s12/ne64badge/scripts/ne64badge-banked.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/ne64badge/ostest/ne64badge-banked.ld
+ * boards/hc/m9s12/ne64badge/ostest/ne64badge-banked.ld
*
* Copyright (C) 2011m, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-nonbanked.ld b/boards/hc/m9s12/ne64badge/scripts/ne64badge-nonbanked.ld
similarity index 98%
rename from boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-nonbanked.ld
rename to boards/hc/m9s12/ne64badge/scripts/ne64badge-nonbanked.ld
index 8215d39af8..0765c88556 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-nonbanked.ld
+++ b/boards/hc/m9s12/ne64badge/scripts/ne64badge-nonbanked.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/ne64badge/ostest/ne64badge-nonbanked.ld
+ * boards/hc/m9s12/ne64badge/ostest/ne64badge-nonbanked.ld
*
* Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/.gitignore b/boards/hc/m9s12/ne64badge/src/.gitignore
similarity index 100%
rename from boards/hc/mcs92s12ne64/ne64badge/src/.gitignore
rename to boards/hc/m9s12/ne64badge/src/.gitignore
diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/Makefile b/boards/hc/m9s12/ne64badge/src/Makefile
similarity index 97%
rename from boards/hc/mcs92s12ne64/ne64badge/src/Makefile
rename to boards/hc/m9s12/ne64badge/src/Makefile
index 05d6bf68c2..7e22f5477f 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/src/Makefile
+++ b/boards/hc/m9s12/ne64badge/src/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# boards/hc/mcs92s12ne64/ne64badge/src/Makefile
+# boards/hc/m9s12/ne64badge/src/Makefile
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_appinit.c b/boards/hc/m9s12/ne64badge/src/m9s12_appinit.c
similarity index 98%
rename from boards/hc/mcs92s12ne64/ne64badge/src/m9s12_appinit.c
rename to boards/hc/m9s12/ne64badge/src/m9s12_appinit.c
index 9cd6f5e00b..4091fb61ef 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_appinit.c
+++ b/boards/hc/m9s12/ne64badge/src/m9s12_appinit.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * config/mcs92s12ne64/ne64badge/src/m9s12_appinit.c
+ * config/m9s12/ne64badge/src/m9s12_appinit.c
*
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_boot.c b/boards/hc/m9s12/ne64badge/src/m9s12_boot.c
similarity index 98%
rename from boards/hc/mcs92s12ne64/ne64badge/src/m9s12_boot.c
rename to boards/hc/m9s12/ne64badge/src/m9s12_boot.c
index 0f6da5e807..f9c2a46a07 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_boot.c
+++ b/boards/hc/m9s12/ne64badge/src/m9s12_boot.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/ne64badge/src/m9s12_boot.c
+ * boards/hc/m9s12/ne64badge/src/m9s12_boot.c
*
* Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_buttons.c b/boards/hc/m9s12/ne64badge/src/m9s12_buttons.c
similarity index 98%
rename from boards/hc/mcs92s12ne64/ne64badge/src/m9s12_buttons.c
rename to boards/hc/m9s12/ne64badge/src/m9s12_buttons.c
index 7d712262ac..c3086cd661 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_buttons.c
+++ b/boards/hc/m9s12/ne64badge/src/m9s12_buttons.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/ne64badge/src/m9s12_buttons.c
+ * boards/hc/m9s12/ne64badge/src/m9s12_buttons.c
*
* Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_leds.c b/boards/hc/m9s12/ne64badge/src/m9s12_leds.c
similarity index 98%
rename from boards/hc/mcs92s12ne64/ne64badge/src/m9s12_leds.c
rename to boards/hc/m9s12/ne64badge/src/m9s12_leds.c
index 66a3299f88..2112303d57 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_leds.c
+++ b/boards/hc/m9s12/ne64badge/src/m9s12_leds.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/ne64badge/src/m9s12_leds.c
+ * boards/hc/m9s12/ne64badge/src/m9s12_leds.c
*
* Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_spi.c b/boards/hc/m9s12/ne64badge/src/m9s12_spi.c
similarity index 98%
rename from boards/hc/mcs92s12ne64/ne64badge/src/m9s12_spi.c
rename to boards/hc/m9s12/ne64badge/src/m9s12_spi.c
index 2e37d1c124..57f9aff4fc 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_spi.c
+++ b/boards/hc/m9s12/ne64badge/src/m9s12_spi.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/ne64badge/src/m9s12_spi.c
+ * boards/hc/m9s12/ne64badge/src/m9s12_spi.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/ne64badge.h b/boards/hc/m9s12/ne64badge/src/ne64badge.h
similarity index 99%
rename from boards/hc/mcs92s12ne64/ne64badge/src/ne64badge.h
rename to boards/hc/m9s12/ne64badge/src/ne64badge.h
index 1060fd0a41..110dddc18c 100644
--- a/boards/hc/mcs92s12ne64/ne64badge/src/ne64badge.h
+++ b/boards/hc/m9s12/ne64badge/src/ne64badge.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/hc/mcs92s12ne64/ne64badge/src/ne64badge.h
+ * boards/hc/m9s12/ne64badge/src/ne64badge.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt