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

4 files changed, 5 insertions, 15 deletions

diff --git a/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig
index 23adc8f5b..781b81971 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/defconfig
+++ b/nuttx/configs/pic32mx7mmb/nsh/defconfig
@@ -646,7 +646,6 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # I2C tool settings
 #
-CONFIG_I2CTOOL_BUILTIN=y
 CONFIG_I2CTOOL_MINBUS=1
 CONFIG_I2CTOOL_MAXBUS=4
 #CONFIG_I2CTOOL_MINADDR
@@ -661,7 +660,6 @@ CONFIG_I2CTOOL_DEFFREQ=100000
 #
 # Settings for examples/nx
 #
-CONFIG_EXAMPLES_NX_BUILTIN=y
 CONFIG_EXAMPLES_NX_VPLANE=0
 CONFIG_EXAMPLES_NX_DEVNO=0
 CONFIG_EXAMPLES_NX_BGCOLOR=0x0011
@@ -681,7 +679,6 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=n
 #
 # Settings for examples/nxhello
 #
-CONFIG_EXAMPLES_NXHELLO_BUILTIN=y
 CONFIG_EXAMPLES_NXHELLO_VPLANE=0
 CONFIG_EXAMPLES_NXHELLO_DEVNO=0
 CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011
@@ -693,7 +690,6 @@ CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n
 #
 # Settings for examples/nximage
 #
-CONFIG_EXAMPLES_NXIMAGE_BUILTIN=y
 CONFIG_EXAMPLES_NXIMAGE_VPLANE=0
 CONFIG_EXAMPLES_NXIMAGE_DEVNO=0
 CONFIG_EXAMPLES_NXIMAGE_BPP=16
@@ -722,7 +718,6 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
 #
 # Settings for examples/touchscreen
 #
-CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=y
 CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
@@ -744,7 +739,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"
@@ -757,7 +751,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/pic32mx7mmb/ostest/defconfig b/nuttx/configs/pic32mx7mmb/ostest/defconfig
index 1148aac37..70f6db37e 100644
--- a/nuttx/configs/pic32mx7mmb/ostest/defconfig
+++ b/nuttx/configs/pic32mx7mmb/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/pic32mx7mmb/src/up_usbmsc.c b/nuttx/configs/pic32mx7mmb/src/up_usbmsc.c
index d1f473d4f..5ec64336c 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_usbmsc.c
+++ b/nuttx/configs/pic32mx7mmb/src/up_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/pic32mx7mmb/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/pic32mx7mmb/src/up_usbterm.c b/nuttx/configs/pic32mx7mmb/src/up_usbterm.c
index e9da92be8..7640befc7 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_usbterm.c
+++ b/nuttx/configs/pic32mx7mmb/src/up_usbterm.c
@@ -2,7 +2,7 @@
  * configs/pic32mx7mmb/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
@@ -81,7 +81,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;