summaryrefslogtreecommitdiff
path: root/apps/examples/nx
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-06-12 17:32:00 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-06-12 17:32:00 -0600
commit3980a00ab75c580d1f4246a9be226631832c9e6e (patch)
tree1d8e177d23a39c0fe30e44cc1843cb3f4d737021 /apps/examples/nx
parent5633c904e72b25119bbd9056bc0951ef9f6ad88e (diff)
downloadpx4-nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.tar.gz
px4-nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.tar.bz2
px4-nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.zip
Remove CONFIG_XYZ_BUILTIN configurations, replace with the single CONFIG_NSH_BUILTIN_APPS. Add SAM3/4 sam_periphclks.h which is just a header file that includes the right header file. Misc SAM3U-EK cleanup
Diffstat (limited to 'apps/examples/nx')
-rw-r--r--apps/examples/nx/Kconfig7
-rw-r--r--apps/examples/nx/Makefile2
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)