summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-27 15:29:53 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-27 15:29:53 +0000
commita9445ee1dde0305c7ea03ff1c74447a6e4f53a98 (patch)
treeef6f6626dbdbf7939d763ff9c2b6bf019b85126f /apps
parent71edd43b4ed83fbb8b5d6cf84e6ce1bd3ea289ad (diff)
downloadnuttx-a9445ee1dde0305c7ea03ff1c74447a6e4f53a98.tar.gz
nuttx-a9445ee1dde0305c7ea03ff1c74447a6e4f53a98.tar.bz2
nuttx-a9445ee1dde0305c7ea03ff1c74447a6e4f53a98.zip
Definitions for ARMv7-M AIRCR register, Fixes for ADS7843 and SSD1289 driver, Missing build logic for examples/watchdog
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5198 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
-rw-r--r--apps/ChangeLog.txt1
-rw-r--r--apps/examples/Make.defs4
2 files changed, 5 insertions, 0 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index d24494f54..64a923559 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -345,3 +345,4 @@
either the nuttx/ or the apps/ source trees. This kludge makes it
possible to configure NxWidgets/NxWM without too much trouble (with
the tradeoff being a kind ugly structure and some maintenance issues).
+ * apps/examples/Make.defs: Missing support for apps/examples/watchdog.
diff --git a/apps/examples/Make.defs b/apps/examples/Make.defs
index a6e0ae88e..e6b1f3ca3 100644
--- a/apps/examples/Make.defs
+++ b/apps/examples/Make.defs
@@ -218,6 +218,10 @@ ifeq ($(CONFIG_EXAMPLES_USBTERM),y)
CONFIGURED_APPS += examples/usbterm
endif
+ifeq ($(CONFIG_EXAMPLES_WATCHDOG),y)
+CONFIGURED_APPS += examples/watchdog
+endif
+
ifeq ($(CONFIG_EXAMPLES_WGET),y)
CONFIGURED_APPS += examples/wget
endif