Merge branch 'master' of http://git.code.sf.net/p/nuttx/git into inte…

…gration

apps/ChangeLog.txt

@@ -572,3 +572,5 @@
 	  clean .dSYM files in directories where .exe may be built (2013-5-30).
 	* apps/examples/nrf35l01_term: Add an example application to demo the
 	  nRF24L01 driver.  From Laurent Latil (2013-6-1).
+	* apps/nshlib/Kconfig:  Add some missing NSH configuration values.
+	  From Lorenz Meier (2013-6-2).

apps/README.txt

@@ -33,7 +33,7 @@ NuttX directory.  Like:
  `- apps
 
 If all of the above conditions are TRUE, then NuttX will be able to
-find the application directory.  If your application directory has a 
+find the application directory.  If your application directory has a
 different name or is location at a different position, then you will
 have to inform the NuttX build system of that location.  There are several
 ways to do that:
@@ -61,7 +61,7 @@ collected during the make context build phase.
 
 To execute an application function:
 
-  exec_builtin() is defined in the nuttx/include/apps/builtin.h 
+  exec_builtin() is defined in the nuttx/include/apps/builtin.h
 
 NuttShell (NSH) Built-In Commands
 ---------------------------------
@@ -98,7 +98,7 @@ Application Configuration File
 The old-style NuttX configuration uses a special configuration file is
 used to configure which applications are to be included in the build.
 The source for this file is  configs/<board>/<configuration>/appconfig.
-The existence of the appconfig file in the board configuration directory\
+The existence of the appconfig file in the board configuration directory
 is sufficient to enable building of applications.
 
 The appconfig file is copied into the apps/ directory as .config when
@@ -250,12 +250,13 @@ A: Here are four:
       a) Copy 'MyBoard' directory to configs/MyBoard.
       b) Add a symbolic link to MyApplication at apps/external
       c) Configure NuttX (usually by:
-      
+
          tools/configure.sh MyBoard/MyConfiguration
 
          or simply by copying defconfig->nutt/.config,
-         setenv.sh->nuttx/setenv.sh, Make.defs->nuttx/Make.defs,
-         appconfig->apps/.config
+         setenv.sh->nuttx/setenv.sh, and Make.defs->nuttx/Make.defs
+         (and appconfig->apps/.config for the old-style, deprecated
+         configuration files).
 
       Using the 'external' link makes it especially easy to add a
       'built-in' application an existing configuration.

apps/examples/Makefile

@@ -60,9 +60,9 @@ CNTXTDIRS = pwm
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 CNTXTDIRS += adc can cdcacm composite cxxtest dhcpd discover flash_test ftpd
-CNTXTDIRS += hello helloxx json keypadtestmodbus mtdpart nettest nxlines
-CNTXTDIRS += nrf24l01_term relays qencoder slcd smart_test tcpecho telnetd
-CNTXTDIRS += watchdog wgetjson
+CNTXTDIRS += hello helloxx json keypadtestmodbus mtdpart nettest nxhello
+CNTXTDIRS += nxlines nrf24l01_term relays qencoder slcd smart_test tcpecho
+CNTXTDIRS += telnetd touchscreen watchdog wgetjson
 endif
 
 ifeq ($(CONFIG_EXAMPLES_LCDRW_BUILTIN),y)
@@ -71,9 +71,6 @@ endif
 ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y)
 CNTXTDIRS += nx
 endif
-ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y)
-CNTXTDIRS += nxhello
-endif
 ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y)
 CNTXTDIRS += nximage
 endif
@@ -86,9 +83,6 @@ endif
 ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y)
 CNTXTDIRS += tiff
 endif
-ifeq ($(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN),y)
-CNTXTDIRS += touchscreen
-endif
 ifeq ($(CONFIG_EXAMPLES_USBMSC_BUILTIN),y)
 CNTXTDIRS += usbstorage
 endif