Merged in upstream, took upstream UART driver without changes, needs re-evaluation (minor diffs to local version)

5 files changed, 5 insertions, 14 deletions

diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig
index 2c88881da..89e5d2498 100644
--- a/nuttx/configs/pic32-starterkit/nsh/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh/defconfig
@@ -599,7 +599,6 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # I2C tool settings
 #
-CONFIG_I2CTOOL_BUILTIN=y
 CONFIG_I2CTOOL_MINBUS=1
 CONFIG_I2CTOOL_MAXBUS=4
 #CONFIG_I2CTOOL_MINADDR
@@ -628,7 +627,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #
 # Settings for examples/usbstorage
 #
-CONFIG_EXAMPLES_USBMSC_BUILTIN=y
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
 CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
@@ -641,7 +639,6 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 #
 # Settings for examples/usbterm
 #
-CONFIG_EXAMPLES_USBTERM_BUILTIN=y
 CONFIG_EXAMPLES_USBTERM_DEVINIT=y
 #CONFIG_EXAMPLES_USBTERM_BUFLEN
 CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig
index 23deb4471..2b596ea2f 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig
@@ -598,7 +598,6 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # I2C tool settings
 #
-CONFIG_I2CTOOL_BUILTIN=y
 CONFIG_I2CTOOL_MINBUS=1
 CONFIG_I2CTOOL_MAXBUS=4
 #CONFIG_I2CTOOL_MINADDR
@@ -627,7 +626,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #
 # Settings for examples/usbstorage
 #
-CONFIG_EXAMPLES_USBMSC_BUILTIN=y
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
 CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
@@ -640,7 +638,6 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 #
 # Settings for examples/usbterm
 #
-CONFIG_EXAMPLES_USBTERM_BUILTIN=y
 CONFIG_EXAMPLES_USBTERM_DEVINIT=y
 #CONFIG_EXAMPLES_USBTERM_BUFLEN
 CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig
index b1b99e4c6..048a148af 100644
--- a/nuttx/configs/pic32-starterkit/ostest/defconfig
+++ b/nuttx/configs/pic32-starterkit/ostest/defconfig
@@ -595,7 +595,6 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # I2C tool settings
 #
-CONFIG_I2CTOOL_BUILTIN=y
 CONFIG_I2CTOOL_MINBUS=1
 CONFIG_I2CTOOL_MAXBUS=4
 #CONFIG_I2CTOOL_MINADDR
@@ -624,7 +623,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #
 # Settings for examples/usbstorage
 #
-CONFIG_EXAMPLES_USBMSC_BUILTIN=n
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
 CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
@@ -637,7 +635,6 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 #
 # Settings for examples/usbterm
 #
-CONFIG_EXAMPLES_USBTERM_BUILTIN=y
 CONFIG_EXAMPLES_USBTERM_DEVINIT=y
 #CONFIG_EXAMPLES_USBTERM_BUFLEN
 CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
diff --git a/nuttx/configs/pic32-starterkit/src/up_usbmsc.c b/nuttx/configs/pic32-starterkit/src/up_usbmsc.c
index 51e450c56..00b374dfd 100644
--- a/nuttx/configs/pic32-starterkit/src/up_usbmsc.c
+++ b/nuttx/configs/pic32-starterkit/src/up_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/pic32-starterkit/src/up_usbmsc.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -87,9 +87,9 @@ int usbmsc_archinitialize(void)
    * this case, there is nothing further to be done here.
    */
 
-#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN
+#ifndef CONFIG_NSH_BUILTIN_APPS
 #  warning "Missing Logic"
-#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */
+#endif /* CONFIG_NSH_BUILTIN_APPS */
 
    return 0;
 }
diff --git a/nuttx/configs/pic32-starterkit/src/up_usbterm.c b/nuttx/configs/pic32-starterkit/src/up_usbterm.c
index 012e8a5c0..e362f09ef 100644
--- a/nuttx/configs/pic32-starterkit/src/up_usbterm.c
+++ b/nuttx/configs/pic32-starterkit/src/up_usbterm.c
@@ -2,7 +2,7 @@
  * configs/pic32-starterkit/src/up_usbterm.c
  * arch/arm/src/board/up_usbterm.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -80,7 +80,7 @@ int usbterm_devinit(void)
    * pic32mx_usbattach() will be called in nsh_archinitialize().
    */
 
-#ifndef CONFIG_EXAMPLES_USBTERM_BUILTIN
+#ifndef CONFIG_NSH_BUILTIN_APPS
   pic32mx_usbattach();
 #endif
   return OK;