From 5868e1dc923d4b066a0eb6a2ce61f0a3e9190540 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>
Date: Sat, 14 Apr 2012 20:22:48 +0000
Subject: [PATCH] More Kconfig updates

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4610 7fd9a85b-ad96-42d3-883c-3090e2eb8679
---
 apps/interpreters/Kconfig    |  2 +-
 apps/netutils/resolv/Kconfig |  4 +---
 apps/system/i2c/Kconfig      | 11 +++++++----
 apps/system/readline/Kconfig |  1 +
 apps/vsn/Kconfig             |  7 +++++++
 nuttx/Kconfig                |  7 +++++++
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/apps/interpreters/Kconfig b/apps/interpreters/Kconfig
index db5b5ff35e..34cbf2eeee 100644
--- a/apps/interpreters/Kconfig
+++ b/apps/interpreters/Kconfig
@@ -5,7 +5,7 @@
 
 comment "Interpreters"
 
-source "$APPSDIR/interprets/hello/Kconfig"
+source "$APPSDIR/interpreters/ficl/Kconfig"
 
 config PCODE
 	bool "Pascal p-code interpreter"
diff --git a/apps/netutils/resolv/Kconfig b/apps/netutils/resolv/Kconfig
index 3274889aa2..f92d732f5f 100644
--- a/apps/netutils/resolv/Kconfig
+++ b/apps/netutils/resolv/Kconfig
@@ -9,11 +9,9 @@ config NETUTILS_RESOLV
 	---help---
 		Enable support for the name resolution.
 
-if NETUTILS_RESOLV
 config NET_RESOLV_ENTRIES
 	int "Number of resolver entries"
 	default 8
+	depends on NETUTILS_RESOLV
 	---help---
 		Number of resolver entries.  Default: 8
-
-endif
\ No newline at end of file
diff --git a/apps/system/i2c/Kconfig b/apps/system/i2c/Kconfig
index f21ee21c1d..745378b372 100644
--- a/apps/system/i2c/Kconfig
+++ b/apps/system/i2c/Kconfig
@@ -11,34 +11,37 @@ config SYSTEM_I2CTOOL
 	---help---
 		Enable support for the I2C tool.
 
-if SYSTEM_I2CTOOL
 config I2CTOOL_BUILTIN
 	bool "NSH built-in command"
 	default y
-	depends on NSH_BUILTIN_APPS
+	depends on SYSTEM_I2CTOOL && NSH_BUILTIN_APPS
 	---help---
 		Build the tools as an NSH built-in command
 
 config I2CTOOL_MINBUS
 	int "Minimum bus number"
 	default 0
+	depends on SYSTEM_I2CTOOL
 	---help---
 		Smallest bus index supported by the hardware (default 0).
 
 config I2CTOOL_MAXBUS
 	int "Maximum bus number"
+	depends on SYSTEM_I2CTOOL
 	default 3
 	---help---
 		Largest bus index supported by the hardware (default 3)
 
 config I2CTOOL_MINADDR
 	hex "Minimum I2C address"
+	depends on SYSTEM_I2CTOOL
 	default 0x03
 	---help---
 		Minium 7-bit device address (default: 0x03)
 
 config I2CTOOL_MAXADDR
 	hex "Maximum I2C address"
+	depends on SYSTEM_I2CTOOL
 	default 0x77
 	---help---
 		Largest 7-bit device address (default: 0x77)
@@ -46,13 +49,13 @@ config I2CTOOL_MAXADDR
 config I2CTOOL_MAXREGADDR
 	hex "Maximum I2C register address"
 	default 0xff
+	depends on SYSTEM_I2CTOOL
 	---help---
 		Largest I2C register address (default: 0xff)
 
 config I2CTOOL_DEFFREQ
 	int "Default I2C frequency"
 	default 4000000
+	depends on SYSTEM_I2CTOOL
 	---help---
 		Default I2C frequency (default: 4000000)
-
-endif
\ No newline at end of file
diff --git a/apps/system/readline/Kconfig b/apps/system/readline/Kconfig
index a7467b15de..2ed9cafd67 100644
--- a/apps/system/readline/Kconfig
+++ b/apps/system/readline/Kconfig
@@ -10,6 +10,7 @@ config SYSTEM_READLINE
 		Enable support for the readline() function.
 
 if SYSTEM_READLINE
+config READLINE_ECHO
 	bool "Echo character input"
 	default y
 	---help---
diff --git a/apps/vsn/Kconfig b/apps/vsn/Kconfig
index ae2bf31307..1f0c25f167 100644
--- a/apps/vsn/Kconfig
+++ b/apps/vsn/Kconfig
@@ -2,3 +2,10 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "VSN board add-ons"
+
+source "$APPSDIR/vsn/poweroff/Kconfig"
+source "$APPSDIR/vsn/ramtron/Kconfig"
+source "$APPSDIR/vsn/sdcard/Kconfig"
+source "$APPSDIR/vsn/sysinfo/Kconfig"
diff --git a/nuttx/Kconfig b/nuttx/Kconfig
index 085bae8814..5e3215d698 100644
--- a/nuttx/Kconfig
+++ b/nuttx/Kconfig
@@ -9,6 +9,13 @@ config APPSDIR
 	string
 	option env="APPSDIR"
 
+# This is a temporary kludge to let the build system know that we are using the new
+# configuration system
+
+config NUTTX_NEWCONFIG
+	bool
+	default y
+
 menu "General Setup"
 config EXPERIMENTAL
 	bool "Prompt for development and/or incomplete code/drivers"