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

6 files changed, 4 insertions, 10 deletions

diff --git a/nuttx/configs/hymini-stm32v/README.txt b/nuttx/configs/hymini-stm32v/README.txt
index 3765dbf35..02ab52113 100644
--- a/nuttx/configs/hymini-stm32v/README.txt
+++ b/nuttx/configs/hymini-stm32v/README.txt
@@ -627,7 +627,7 @@ Where <subdir> is one of the following:
         long file names in the FAT file system.  Please refer to the
         details in the top-level COPYING file.  Please do not use FAT
         long file name unless you are familiar with these patent issues.
-    (4) When built as an NSH add-on command (CONFIG_EXAMPLES_USBMSC_BUILTIN=y),
+    (4) When built as an NSH add-on command (CONFIG_NSH_BUILTIN_APPS=y),
         Caution should be used to assure that the SD drive is not in use when
         the USB storage device is configured.  Specifically, the SD driver
         should be unmounted like:
diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig
index 62793df97..0c3897eff 100644
--- a/nuttx/configs/hymini-stm32v/nsh2/defconfig
+++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig
@@ -691,7 +691,6 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 CONFIG_EXAMPLES_NX=y
-CONFIG_EXAMPLES_NX_BUILTIN=y
 CONFIG_EXAMPLES_NX_VPLANE=0
 CONFIG_EXAMPLES_NX_DEVNO=0
 CONFIG_EXAMPLES_NX_DEFAULT_COLORS=y
@@ -719,14 +718,12 @@ CONFIG_EXAMPLES_NXIMAGE=y
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 CONFIG_EXAMPLES_TOUCHSCREEN=y
-CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=y
 CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 CONFIG_EXAMPLES_USBMSC=y
-CONFIG_EXAMPLES_USBMSC_BUILTIN=y
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
 CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
diff --git a/nuttx/configs/hymini-stm32v/ostest/defconfig b/nuttx/configs/hymini-stm32v/ostest/defconfig
index 6f515839b..209b5634b 100644
--- a/nuttx/configs/hymini-stm32v/ostest/defconfig
+++ b/nuttx/configs/hymini-stm32v/ostest/defconfig
@@ -516,7 +516,6 @@ CONFIG_SCHED_WORKSTACKSIZE=1024
 # CONFIG_EXAMPLES_NXLINES is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
-# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=8
diff --git a/nuttx/configs/hymini-stm32v/src/up_usbmsc.c b/nuttx/configs/hymini-stm32v/src/up_usbmsc.c
index c5abaa911..e7fc41907 100644
--- a/nuttx/configs/hymini-stm32v/src/up_usbmsc.c
+++ b/nuttx/configs/hymini-stm32v/src/up_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/hymini-stm32v/src/up_usbmsc.c
  *
- *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the STM32 MMC/SD SDIO block driver.
@@ -114,7 +114,7 @@ int usbmsc_archinitialize(void)
    * this case, there is nothing further to be done here.
    */
 
-#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN
+#ifndef CONFIG_NSH_BUILTIN_APPS
   FAR struct sdio_dev_s *sdio;
   int ret;
 
@@ -156,7 +156,7 @@ int usbmsc_archinitialize(void)
 
    sdio_mediachange(sdio, true);
 
-#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */
+#endif /* CONFIG_NSH_BUILTIN_APPS */
 
    return OK;
 }
diff --git a/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig
index ca793bae7..25382b32b 100755
--- a/nuttx/configs/hymini-stm32v/usbserial/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig
@@ -477,7 +477,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #
 # Settings for examples/usbterm
 #
-CONFIG_EXAMPLES_USBTERM_BUILTIN=n
 CONFIG_EXAMPLES_USBTERM_BUFLEN=256
 CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
 CONFIG_EXAMPLES_USBTERM_TRACECLASS=n
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbstorage/defconfig
index 1982faaf0..da13197a5 100755
--- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbstorage/defconfig
@@ -464,7 +464,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"