diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-13 09:14:40 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-13 09:14:40 +0200 |
| commit | c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf (patch) | |
| tree | 2254ceb7c66ba63b6cb6738af92c839f3868c748 /apps/examples/nx | |
| parent | bc5c15a4909386a1efd556f4648385440379b164 (diff) | |
| download | px4-nuttx-c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf.tar.gz px4-nuttx-c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf.tar.bz2 px4-nuttx-c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf.zip | |
Merged in upstream, took upstream UART driver without changes, needs re-evaluation (minor diffs to local version)
Diffstat (limited to 'apps/examples/nx')
| -rw-r--r-- | apps/examples/nx/Kconfig | 7 | ||||
| -rw-r--r-- | apps/examples/nx/Makefile | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/apps/examples/nx/Kconfig b/apps/examples/nx/Kconfig index 4dcc42579..59ee98a18 100644 --- a/apps/examples/nx/Kconfig +++ b/apps/examples/nx/Kconfig @@ -11,13 +11,6 @@ config EXAMPLES_NX if EXAMPLES_NX -config EXAMPLES_NX_BUILTIN - bool "NSH Built-IN" - depends on NSH_BUILTIN_APPS - ---help--- - Build the NX example as a "built-in" that can be executed from the - NSH command line - config EXAMPLES_NX_VPLANE int "Video Plane" default 0 diff --git a/apps/examples/nx/Makefile b/apps/examples/nx/Makefile index 13a938821..ea802d9e7 100644 --- a/apps/examples/nx/Makefile +++ b/apps/examples/nx/Makefile @@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y) +ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) |