Rename pic32-starterkit to pic32mx-starterkit to make room in the namespace for the pic32mz-starterkit

27 files changed, 89 insertions, 93 deletions

diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index bf63b3d3c..8bb462992 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -4261,7 +4261,7 @@ Mem:         29232       5920      23312      23312
          A verified configuration is available for the NuttShel (NSH) appeared in NuttX-6.16.
          Board support includes a verified USB (device-side) driver.
          Also included are a a verified Ethernet driver, a partially verified USB device controller driver, and an unverifed SPI driver.
-         Refer to the NuttX board <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/pic32-starterkit/README.txt">README</a> file for further information.
+         Refer to the NuttX board <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/pic32mx-starterkit/README.txt">README</a> file for further information.
       </p>
      <li><b>Mikroelektronika PIC32MX7 Mulitmedia Board (MMB)</b>.
         A port has been completed for the  Mikroelektronika PIC32MX7 Multimedia Board (MMB).
diff --git a/nuttx/Documentation/README.html b/nuttx/Documentation/README.html
index 74f12f4f6..65a1bbe0d 100644
--- a/nuttx/Documentation/README.html
+++ b/nuttx/Documentation/README.html
@@ -176,8 +176,8 @@
  |   |   |   `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/pcblogic-pic32mx/README.txt"><b><i>README.txt</i></b></a>
  |   |   |- pcduino-a10/
  |   |   |   `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/pcduino-pic32mx/README.txt"><b><i>README.txt</i></b></a>
- |   |   |- pic32-starterkit/
- |   |   |   `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/pic32-a10/README.txt"><b><i>README.txt</i></b></a>
+ |   |   |- pic32mx-starterkit/
+ |   |   |   `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/pic32mx-starterkit/README.txt"><b><i>README.txt</i></b></a>
  |   |   |- pic32mx7mmb/
  |   |   |   `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/pic32mx7mmb/README.txt"><b><i>README.txt</i></b></a>
  |   |   |- pirelli_dpl10/
diff --git a/nuttx/README.txt b/nuttx/README.txt
index 044badb7e..3db22193a 100644
--- a/nuttx/README.txt
+++ b/nuttx/README.txt
@@ -1233,7 +1233,7 @@ nuttx
  |   |   `- README.txt
  |   |- pcduino-a10/
  |   |   `- README.txt
- |   |- pic32-starterkit/
+ |   |- pic32mx-starterkit/
  |   |   `- README.txt
  |   |- pic32mx7mmb/
  |   |   `- README.txt
diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
index 29c62bc3b..fa45a76ce 100644
--- a/nuttx/configs/Kconfig
+++ b/nuttx/configs/Kconfig
@@ -552,7 +552,7 @@ config ARCH_BOARD_PCDUINO_A10
 		the differences are cosmetic.  This port was developed on the v1 board,
 		but the others may be compatible.
 
-config ARCH_BOARD_PIC32_STARTERKIT
+config ARCH_BOARD_PIC32MX_STARTERKIT
 	bool "Microchip PIC32 Ethernet Starter Kit (DM320004)"
 	depends on ARCH_CHIP_PIC32MX795F512L
 	select ARCH_HAVE_LEDS
@@ -1109,7 +1109,7 @@ config ARCH_BOARD
 	default "p112"                     if ARCH_BOARD_P112
 	default "pcblogic-pic32mx"         if ARCH_BOARD_PCBLOGICPIC32MX
 	default "pcduino-a10"              if ARCH_BOARD_PCDUINO_A10
-	default "pic32-starterkit"         if ARCH_BOARD_PIC32_STARTERKIT
+	default "pic32mx-starterkit"       if ARCH_BOARD_PIC32MX_STARTERKIT
 	default "pic32mx7mmb"              if ARCH_BOARD_PIC32MX7MMB
 	default "pirelli_dpl10"            if ARCH_BOARD_PIRELLI_DPL10
 	default "nucleo-f4x1re"            if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE
@@ -1373,8 +1373,8 @@ endif
 if ARCH_BOARD_PCDUINO_A10
 source "configs/pcduino-a10/Kconfig"
 endif
-if ARCH_BOARD_PIC32_STARTERKIT
-source "configs/pic32-starterkit/Kconfig"
+if ARCH_BOARD_PIC32MX_STARTERKIT
+source "configs/pic32mx-starterkit/Kconfig"
 endif
 if ARCH_BOARD_PIC32MX7MMB
 source "configs/pic32mx7mmb/Kconfig"
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index 3957688ad..f43a6b810 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -452,7 +452,7 @@ configs/p112
   Dave Brooks was successfully funded through Kickstarter for and another
   run of P112 boards in November of 2012.
 
-configs/pic32-starterkit
+configs/pic32mx-starterkit
   This directory contains the port of NuttX to the Microchip PIC32 Ethernet
   Starter Kit (DM320004) with the Multimedia Expansion Board (MEB, DM320005).
   See www.microchip.com for further information.
diff --git a/nuttx/configs/pic32-starterkit/Kconfig b/nuttx/configs/pic32mx-starterkit/Kconfig
index 7689eee13..5537bcf16 100644
--- a/nuttx/configs/pic32-starterkit/Kconfig
+++ b/nuttx/configs/pic32mx-starterkit/Kconfig
@@ -3,5 +3,5 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-if ARCH_BOARD_PIC32_STARTERKIT
+if ARCH_BOARD_PIC32MX_STARTERKIT
 endif
diff --git a/nuttx/configs/pic32-starterkit/README.txt b/nuttx/configs/pic32mx-starterkit/README.txt
index e02a593ba..e17d940a9 100644
--- a/nuttx/configs/pic32-starterkit/README.txt
+++ b/nuttx/configs/pic32mx-starterkit/README.txt
@@ -1,4 +1,4 @@
-configs/pic32-starterkit README
+configs/pic32mx-starterkit README
 ===============================
 
 
@@ -802,11 +802,11 @@ PIC32MX Configuration Options
     CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
        hence, the board that supports the particular chip or SoC.
 
-       CONFIG_ARCH_BOARD=pic32-starterkit
+       CONFIG_ARCH_BOARD=pic32mx-starterkit
 
     CONFIG_ARCH_BOARD_name - For use in C code
 
-       CONFIG_ARCH_BOARD_PIC32_STARTERKIT=y
+       CONFIG_ARCH_BOARD_PIC32MX_STARTERKIT=y
 
     CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
        of delay loops
@@ -1019,7 +1019,7 @@ Each PIC32MX configuration is maintained in a sub-directory and can be
 selected as follow:
 
     cd tools
-    ./configure.sh pic32-starterkit/<subdir>
+    ./configure.sh pic32mx-starterkit/<subdir>
     cd -
     . ./setenv.sh
 
diff --git a/nuttx/configs/pic32-starterkit/include/board.h b/nuttx/configs/pic32mx-starterkit/include/board.h
index ebe15e89b..0d8d7372b 100644
--- a/nuttx/configs/pic32-starterkit/include/board.h
+++ b/nuttx/configs/pic32mx-starterkit/include/board.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/pic32-starterkit/include/board.h
+ * configs/pic32mx-starterkit/include/board.h
  * include/arch/board/board.h
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
diff --git a/nuttx/configs/pic32-starterkit/nsh/Make.defs b/nuttx/configs/pic32mx-starterkit/nsh/Make.defs
index 8c5346646..fae51b72d 100644
--- a/nuttx/configs/pic32-starterkit/nsh/Make.defs
+++ b/nuttx/configs/pic32mx-starterkit/nsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/pic32-starterkit/nsh/Make.defs
+# configs/pic32mx-starterkit/nsh/Make.defs
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32mx-starterkit/nsh/defconfig
index 9fe9c04fb..af30e38ef 100644
--- a/nuttx/configs/pic32-starterkit/nsh/defconfig
+++ b/nuttx/configs/pic32mx-starterkit/nsh/defconfig
@@ -298,10 +298,10 @@ CONFIG_RAM_SIZE=131072
 #
 # Board Selection
 #
-CONFIG_ARCH_BOARD_PIC32_STARTERKIT=y
+CONFIG_ARCH_BOARD_PIC32MX_STARTERKIT=y
 # CONFIG_ARCH_BOARD_PIC32MX7MMB is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
-CONFIG_ARCH_BOARD="pic32-starterkit"
+CONFIG_ARCH_BOARD="pic32mx-starterkit"
 
 #
 # Common Board Options
diff --git a/nuttx/configs/pic32-starterkit/nsh2/ld.script b/nuttx/configs/pic32mx-starterkit/nsh/ld.script
index 1c9511cc4..ab777f4a9 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/ld.script
+++ b/nuttx/configs/pic32mx-starterkit/nsh/ld.script
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/pic32-starterkit/nsh2/ld.script
+ * configs/pic32mx-starterkit/nsh/ld.script
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/pic32-starterkit/nsh2/setenv.sh b/nuttx/configs/pic32mx-starterkit/nsh/setenv.sh
index cd6d8fa45..a172de763 100755
--- a/nuttx/configs/pic32-starterkit/nsh2/setenv.sh
+++ b/nuttx/configs/pic32mx-starterkit/nsh/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/pic32-starterkit/nsh2/setenv.sh
+# configs/pic32mx-starterkit/nsh/setenv.sh
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/pic32-starterkit/nsh2/Make.defs b/nuttx/configs/pic32mx-starterkit/nsh2/Make.defs
index d8bd81e0e..0b302c219 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/Make.defs
+++ b/nuttx/configs/pic32mx-starterkit/nsh2/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/pic32-starterkit/nsh2/Make.defs
+# configs/pic32mx-starterkit/nsh2/Make.defs
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32mx-starterkit/nsh2/defconfig
index c16e92059..0cd186b49 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/defconfig
+++ b/nuttx/configs/pic32mx-starterkit/nsh2/defconfig
@@ -307,10 +307,10 @@ CONFIG_RAM_SIZE=131072
 #
 # Board Selection
 #
-CONFIG_ARCH_BOARD_PIC32_STARTERKIT=y
+CONFIG_ARCH_BOARD_PIC32MX_STARTERKIT=y
 # CONFIG_ARCH_BOARD_PIC32MX7MMB is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
-CONFIG_ARCH_BOARD="pic32-starterkit"
+CONFIG_ARCH_BOARD="pic32mx-starterkit"
 
 #
 # Common Board Options
diff --git a/nuttx/configs/pic32-starterkit/nsh/ld.script b/nuttx/configs/pic32mx-starterkit/nsh2/ld.script
index 3e5ea6e03..5b59963f6 100644
--- a/nuttx/configs/pic32-starterkit/nsh/ld.script
+++ b/nuttx/configs/pic32mx-starterkit/nsh2/ld.script
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/pic32-starterkit/nsh/ld.script
+ * configs/pic32mx-starterkit/nsh2/ld.script
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/pic32-starterkit/nsh/setenv.sh b/nuttx/configs/pic32mx-starterkit/nsh2/setenv.sh
index bd024bca0..480abdcbf 100755
--- a/nuttx/configs/pic32-starterkit/nsh/setenv.sh
+++ b/nuttx/configs/pic32mx-starterkit/nsh2/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/pic32-starterkit/nsh/setenv.sh
+# configs/pic32mx-starterkit/nsh2/setenv.sh
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/pic32-starterkit/src/.gitignore b/nuttx/configs/pic32mx-starterkit/src/.gitignore
index 726d936e1..726d936e1 100644
--- a/nuttx/configs/pic32-starterkit/src/.gitignore
+++ b/nuttx/configs/pic32mx-starterkit/src/.gitignore
diff --git a/nuttx/configs/pic32-starterkit/src/Makefile b/nuttx/configs/pic32mx-starterkit/src/Makefile
index 1b1e3536e..7a5878e12 100644
--- a/nuttx/configs/pic32-starterkit/src/Makefile
+++ b/nuttx/configs/pic32mx-starterkit/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/pic32-starterkit/src/Makefile
+# configs/pic32mx-starterkit/src/Makefile
 #
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,39 +35,39 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(TOPDIR)/sched
+CFLAGS += -I$(TOPDIR)/sched
 
-ASRCS		=
-CSRCS		= up_boot.c up_leds.c up_spi.c
+ASRCS =
+CSRCS = pic32mx_boot.c pic32mx_leds.c pic32mx_spi.c
 
 ifeq ($(CONFIG_PIC32MX_USBDEV),y)
-CSRCS		+= up_usbdev.c
+CSRCS += pic32mx_usbdev.c
 ifeq ($(CONFIG_EXAMPLES_USBTERM_DEVINIT),y)
-CSRCS		+= up_usbterm.c
+CSRCS += pic32mx_usbterm.c
 endif
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += pic32mx_nsh.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbmsc.c
+CSRCS += pic32mx_usbmsc.c
 endif
 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
+ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/mips32}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/mips32}"
 else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/mips32
+  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/mips32
 endif
 
 all: libboard$(LIBEXT)
diff --git a/nuttx/configs/pic32-starterkit/src/starterkit_internal.h b/nuttx/configs/pic32mx-starterkit/src/pic32mx-starterkit.h
index f95859916..7e57a6e7f 100644
--- a/nuttx/configs/pic32-starterkit/src/starterkit_internal.h
+++ b/nuttx/configs/pic32mx-starterkit/src/pic32mx-starterkit.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/pic32-starterkit/src/starterkit_internal.h
+ * configs/pic32mx-starterkit/src/pic32mx-starterkit.h
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __CONFIGS_PIC32_STARTERKIT_SRC_STARTERKIT_INTERNAL_H
-#define __CONFIGS_PIC32_STARTERKIT_SRC_STARTERKIT_INTERNAL_H
+#ifndef __CONFIGS_PIC32MX_STARTERKIT_SRC_PIC32MX_STARTERKIT_H
+#define __CONFIGS_PIC32MX_STARTERKIT_SRC_PIC32MX_STARTERKIT_H
 
 /****************************************************************************
  * Included Files
@@ -84,7 +84,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
@@ -98,7 +99,7 @@ extern "C" {
  ************************************************************************************/
 
 #if defined(CONFIG_PIC32MX_SPI2)
-EXTERN void weak_function pic32mx_spiinitialize(void);
+void weak_function pic32mx_spiinitialize(void);
 #endif
 
 /************************************************************************************
@@ -110,7 +111,7 @@ EXTERN void weak_function pic32mx_spiinitialize(void);
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
-EXTERN void pic32mx_ledinit(void);
+void pic32mx_ledinit(void);
 #endif
 
 #undef EXTERN
@@ -119,4 +120,4 @@ EXTERN void pic32mx_ledinit(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CONFIGS_PIC32_STARTERKIT_SRC_STARTERKIT_INTERNAL_H */
+#endif /* __CONFIGS_PIC32MX_STARTERKIT_SRC_PIC32MX_STARTERKIT_H */
diff --git a/nuttx/configs/pic32-starterkit/src/up_boot.c b/nuttx/configs/pic32mx-starterkit/src/pic32mx_boot.c
index 2b357993c..9fa0c9ca2 100644
--- a/nuttx/configs/pic32-starterkit/src/up_boot.c
+++ b/nuttx/configs/pic32mx-starterkit/src/pic32mx_boot.c
@@ -1,8 +1,7 @@
 /************************************************************************************
- * configs/pic32-starterkit/src/up_boot.c
- * arch/mips/src/board/up_boot.c
+ * configs/pic32mx-starterkit/src/pic32mx_boot.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,10 +47,10 @@
 #include "up_internal.h"
 
 #include "pic32mx-internal.h"
-#include "starterkit_internal.h"
+#include "pic32mx-starterkit.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
@@ -67,7 +66,7 @@
  *
  * Description:
  *   All PIC32MX architectures must provide the following entry point.  This entry
- *   point is called early in the intitialization -- after all memory has been
+ *   point is called early in the initialization -- after all memory has been
  *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
diff --git a/nuttx/configs/pic32-starterkit/src/up_leds.c b/nuttx/configs/pic32mx-starterkit/src/pic32mx_leds.c
index c7d61d15a..9ce1640cb 100644
--- a/nuttx/configs/pic32-starterkit/src/up_leds.c
+++ b/nuttx/configs/pic32mx-starterkit/src/pic32mx_leds.c
@@ -1,8 +1,7 @@
 /****************************************************************************
- * configs/pic32-starterkit/src/up_leds.c
- * arch/arm/src/board/up_leds.c
+ * configs/pic32mx-starterkit/src/pic32mx_leds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,13 +51,13 @@
 
 #include "pic32mx-internal.h"
 #include "pic32mx-ioport.h"
-#include "starterkit_internal.h"
+#include "pic32mx-starterkit.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* LED Configuration ********************************************************/
-/* The PIC32MX Ethernet Starter kit has 3 user LEDs labeled LED1-3 on the
+/* The PIC32MX Ethernet Starter kit has 3 user LEDs labelled LED1-3 on the
  * board graphics (but referred to as LED4-6 in the schematic):
  *
  * PIN User's Guide  Board Stencil  Notes
@@ -170,11 +169,11 @@ static const uint16_t g_ledpincfg[PIC32MX_STARTERKIT_NLEDS] =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_setleds
+ * Name: pic32mx_setleds
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
-void up_setleds(FAR const struct led_setting_s *setting)
+static void pic32mx_setleds(FAR const struct led_setting_s *setting)
 {
   if (setting->led1 != LED_NC)
     {
@@ -246,7 +245,7 @@ void board_led_on(int led)
 {
   if ((unsigned)led < LED_NVALUES)
     {
-      up_setleds(&g_ledonvalues[led]);
+      pic32mx_setleds(&g_ledonvalues[led]);
     }
 }
 #endif
@@ -260,7 +259,7 @@ void board_led_off(int led)
 {
   if ((unsigned)led < LED_NVALUES)
     {
-      up_setleds(&g_ledoffvalues[led]);
+      pic32mx_setleds(&g_ledoffvalues[led]);
     }
 }
 #endif
diff --git a/nuttx/configs/pic32-starterkit/src/up_nsh.c b/nuttx/configs/pic32mx-starterkit/src/pic32mx_nsh.c
index 2a03da2a2..d092182df 100644
--- a/nuttx/configs/pic32-starterkit/src/up_nsh.c
+++ b/nuttx/configs/pic32mx-starterkit/src/pic32mx_nsh.c
@@ -1,8 +1,7 @@
 /****************************************************************************
- * config/pic32-starterkit/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/pic32mx-starterkit/src/pic32mx_nsh.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +49,7 @@
 #include <nuttx/usb/usbhost.h>
 
 #include "pic32mx-internal.h"
-#include "starterkit_internal.h"
+#include "pic32mx-starterkit.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
@@ -235,7 +234,7 @@ static int nsh_sdinitialize(void)
   /* Bind the SPI port to the slot */
 
   ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR,
-                               CONFIG_NSH_MMCSDSLOTNO, ssp);
+                                CONFIG_NSH_MMCSDSLOTNO, ssp);
   if (ret < 0)
     {
       syslog(LOG_ERR,
@@ -358,5 +357,6 @@ int nsh_archinitialize(void)
 
       ret = nsh_usbdevinitialize();
     }
+
   return ret;
 }
diff --git a/nuttx/configs/pic32-starterkit/src/up_spi.c b/nuttx/configs/pic32mx-starterkit/src/pic32mx_spi.c
index 962dac33d..5ed763cc7 100644
--- a/nuttx/configs/pic32-starterkit/src/up_spi.c
+++ b/nuttx/configs/pic32mx-starterkit/src/pic32mx_spi.c
@@ -1,8 +1,7 @@
 /************************************************************************************
- * configs/pic32-starterkit/src/up_ssp.c
- * arch/arm/src/board/up_ssp.c
+ * configs/pic32mx-starterkit/src/pic32mx_spi.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,13 +49,13 @@
 #include "up_arch.h"
 #include "chip.h"
 #include "pic32mx-internal.h"
-#include "starterkit_internal.h"
+#include "pic32mx-starterkit.h"
 
 #if defined(CONFIG_PIC32MX_SPI1) || defined(CONFIG_PIC32MX_SPI2) || \
     defined(CONFIG_PIC32MX_SPI3) || defined(CONFIG_PIC32MX_SPI4)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* The following enable debug output from this file (needs CONFIG_DEBUG too).
@@ -155,20 +154,20 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #endif
 
 #ifdef CONFIG_PIC32MX_SPI1
-void  pic31mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+void  pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
-uint8_t pic31mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   sspdbg("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
 #ifdef CONFIG_SPI_CMDDATA
-int pic31mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 {
 #warning "Missing logic"
   return 0;
diff --git a/nuttx/configs/pic32-starterkit/src/up_usbdev.c b/nuttx/configs/pic32mx-starterkit/src/pic32mx_usbdev.c
index 4779bd33a..0ae14f260 100644
--- a/nuttx/configs/pic32-starterkit/src/up_usbdev.c
+++ b/nuttx/configs/pic32mx-starterkit/src/pic32mx_usbdev.c
@@ -1,8 +1,7 @@
 /************************************************************************************
- * configs/pic32-starterkit/src/up_usbdev.c
- * arch/arm/src/board/up_usbdev.c
+ * configs/pic32mx-starterkit/src/pic32mx_usbdev.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,12 +45,12 @@
 #include <nuttx/usb/usbdev.h>
 
 #include "pic32mx-internal.h"
-#include "starterkit_internal.h"
+#include "pic32mx-starterkit.h"
 
 #if defined(CONFIG_PIC32MX_USBDEV)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /*
  * PIN  NAME                            SIGNAL         NOTES
diff --git a/nuttx/configs/pic32-starterkit/src/up_usbmsc.c b/nuttx/configs/pic32mx-starterkit/src/pic32mx_usbmsc.c
index 0d010ed68..c76196304 100644
--- a/nuttx/configs/pic32-starterkit/src/up_usbmsc.c
+++ b/nuttx/configs/pic32mx-starterkit/src/pic32mx_usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/pic32-starterkit/src/up_usbmsc.c
+ * configs/pic32mx-starterkit/src/up_usbmsc.c
  *
  *   Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include "starterkit_internal.h"
+#include "pic32mx-starterkit.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/nuttx/configs/pic32-starterkit/src/up_usbterm.c b/nuttx/configs/pic32mx-starterkit/src/pic32mx_usbterm.c
index e362f09ef..80a4ce4b5 100644
--- a/nuttx/configs/pic32-starterkit/src/up_usbterm.c
+++ b/nuttx/configs/pic32mx-starterkit/src/pic32mx_usbterm.c
@@ -1,8 +1,7 @@
 /************************************************************************************
- * configs/pic32-starterkit/src/up_usbterm.c
- * arch/arm/src/board/up_usbterm.c
+ * configs/pic32mx-starterkit/src/pic32mx_usbterm.c
  *
- *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,12 +45,12 @@
 #include <nuttx/usb/usbdev.h>
 
 #include "pic32mx-internal.h"
-#include "starterkit_internal.h"
+#include "pic32mx-starterkit.h"
 
 #if defined(CONFIG_PIC32MX_USBDEV) && defined(CONFIG_EXAMPLES_USBTERM_DEVINIT)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig
index 0cdd03c1e..b23f976a7 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/defconfig
+++ b/nuttx/configs/pic32mx7mmb/nsh/defconfig
@@ -312,7 +312,7 @@ CONFIG_RAM_SIZE=131072
 #
 # Board Selection
 #
-# CONFIG_ARCH_BOARD_PIC32_STARTERKIT is not set
+# CONFIG_ARCH_BOARD_PIC32MX_STARTERKIT is not set
 CONFIG_ARCH_BOARD_PIC32MX7MMB=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="pic32mx7mmb"