diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-14 20:22:48 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-14 20:22:48 +0000 |
commit | b53d8081c1e407bdc9188f9b4f320846a1a50241 (patch) | |
tree | 5e029bfe0e09ca46b3a8ab206776255f6c936c63 | |
parent | 9bb8a758ba47732e5a172bd4036b0ea12a08d7f9 (diff) | |
download | nuttx-b53d8081c1e407bdc9188f9b4f320846a1a50241.tar.gz nuttx-b53d8081c1e407bdc9188f9b4f320846a1a50241.tar.bz2 nuttx-b53d8081c1e407bdc9188f9b4f320846a1a50241.zip |
More Kconfig updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4610 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r-- | apps/interpreters/Kconfig | 2 | ||||
-rw-r--r-- | apps/netutils/resolv/Kconfig | 4 | ||||
-rw-r--r-- | apps/system/i2c/Kconfig | 11 | ||||
-rw-r--r-- | apps/system/readline/Kconfig | 1 | ||||
-rw-r--r-- | apps/vsn/Kconfig | 7 | ||||
-rw-r--r-- | nuttx/Kconfig | 7 |
6 files changed, 24 insertions, 8 deletions
diff --git a/apps/interpreters/Kconfig b/apps/interpreters/Kconfig index db5b5ff35..34cbf2eee 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 3274889aa..f92d732f5 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 f21ee21c1..745378b37 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 a7467b15d..2ed9cafd6 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 ae2bf3130..1f0c25f16 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 085bae881..5e3215d69 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" |