Add a little more configuration logic

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4587 42af7a65-404d-4744-a932-0658087f49c3

6 files changed, 70 insertions, 24 deletions

diff --git a/nuttx/Kconfig b/nuttx/Kconfig
index 6b0973f2c..0b140e16f 100644
--- a/nuttx/Kconfig
+++ b/nuttx/Kconfig
@@ -9,6 +9,10 @@ config SRCARCH
 	string
 	option env="SRCARCH"
 
+config APPSDIR
+	string
+	option env="APPSDIR"
+
 menu "General setup"
 config EXPERIMENTAL
 	bool "Prompt for development and/or incomplete code/drivers"
@@ -35,6 +39,7 @@ config DEBUG
 	default n
 	---help---
 		enables built-in debug options
+
 if DEBUG
 config DEBUG_VERBOSE
 	bool "enable debug verbose"
@@ -110,7 +115,7 @@ config DEBUG_GRAPHICS
 	---help---
 		enable NX graphics debug output
 		(disabled by default)
-endif	
+endif
 endmenu
 
 menu "System Type"
@@ -140,3 +145,7 @@ menu "Library routines"
 source lib/Kconfig
 source libxx/Kconfig
 endmenu
+
+menu "Application configuration"
+source "$APPSDIR/Kconfig"
+endmenu
diff --git a/nuttx/Makefile b/nuttx/Makefile
index 4b832898e..c6ace3c76 100644
--- a/nuttx/Makefile
+++ b/nuttx/Makefile
@@ -606,5 +606,5 @@ endif
 
 ARCH ?=sim
 menuconfig:
-	SRCARCH=${ARCH} mconf Kconfig
+	SRCARCH=${ARCH} APPSDIR=${CONFIG_APPS_DIR} mconf Kconfig
 	
diff --git a/nuttx/fs/fat/Kconfig b/nuttx/fs/fat/Kconfig
index 9a023c297..8c9617af7 100644
--- a/nuttx/fs/fat/Kconfig
+++ b/nuttx/fs/fat/Kconfig
@@ -9,21 +9,20 @@ comment "FAT file system configuration"
 config FS_FAT
 	bool "FAT file system"
 	default n
-#	depends on CONFIG_NFILE_DESCRIPTORS > 0 && !CONFIG_DISABLE_MOUNTPOINT
+	depends on !DISABLE_MOUNTPOINT
 	---help---
 		Enable FAT filesystem support
 
+if FS_FAT
 config FAT_SECTORSIZE
 	int "FAT sector size"
 	default 512
-	depends on FS_FAT
 	---help---
 		Max supported sector size
 
 config FAT_LCNAMES
 	bool "FAT upper/lower names"
 	default n
-	depends on FS_FAT
 	---help---
 		Enable use of the NT-style upper/lower case 8.3
 		file name support.
@@ -31,7 +30,6 @@ config FAT_LCNAMES
 config FAT_LFN
 	bool "FAT long file names"
 	default n
-	depends on FS_FAT
 	---help---
 		Enable FAT long file names.  NOTE:  Microsoft claims
 		patents on FAT long file name technology.  Please read the
@@ -54,10 +52,10 @@ config FAT_MAXFNAME
 config FS_FATTIME
 	bool "FAT timestamps"
 	default n
-	depends on FS_FAT
 	---help---	
 		Support FAT date and time. NOTE:  There is not
 		much sense in supporting FAT date and time unless you have a
 		hardware RTC or other way to get the time and date.
 
+endif
 endmenu
diff --git a/nuttx/fs/nxffs/Kconfig b/nuttx/fs/nxffs/Kconfig
index 39170a927..f6aede4a2 100644
--- a/nuttx/fs/nxffs/Kconfig
+++ b/nuttx/fs/nxffs/Kconfig
@@ -9,13 +9,14 @@ comment "NXFFS file system configuration"
 config FS_NXFFS
 	bool "NXFFS file system"
 	default n
+	depends on !DISABLE_MOUNTPOINT
 	---help---
 		Enable NuttX FLASH file system (NXFF) support.
 
+if FS_NXFFS
 config NXFFS_ERASEDSTATE
 	bool "FLASH erased state"
 	default n
-	depends on FS_NXFFS
 	---help---	
 		The erased state of FLASH. 
 		This must have one of the values of 0xff or 0x00.
@@ -24,7 +25,6 @@ config NXFFS_ERASEDSTATE
 config NXFFS_PACKTHRESHOLD
 	bool "Re-packing threshold"
 	default n
-	depends on FS_NXFFS
 	---help---
 		When packing flash file data,
 		don't both with file chunks smaller than this number of data bytes.
@@ -33,7 +33,6 @@ config NXFFS_PACKTHRESHOLD
 config NXFFS_MAXNAMLEN
 	bool "Maximum file name length"
 	default n
-	depends on FS_NXFFS
 	---help---	
 		The maximum size of an NXFFS file name.
 		Default: 255.
@@ -41,7 +40,6 @@ config NXFFS_MAXNAMLEN
 config NXFFS_TAILTHRESHOLD
 	bool "Tail threshold"
 	default n
-	depends on FS_NXFFS
 	---help---	
 		clean-up can either mean
 		packing files together toward the end of the file or, if file are
@@ -53,4 +51,5 @@ config NXFFS_TAILTHRESHOLD
 		and making it available for re-use (and possible over-wear).
 		Default: 8192.
 
+endif
 endmenu
diff --git a/nuttx/lib/Kconfig b/nuttx/lib/Kconfig
index cc34d9db0..6c2bd3f1c 100644
--- a/nuttx/lib/Kconfig
+++ b/nuttx/lib/Kconfig
@@ -2,32 +2,57 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config STDIO_BUFFER_SIZE
+	int "C STDIO buffer size"
+	default 64
+	---help---
+		Size of buffers using within the C buffered I/O interfaces.
+		(printf, putchar, fwrite, etc.).
+
+config STDIO_LINEBUFFER
+	bool "STDIO line buffering"
+	default y
+	---help---
+		Flush buffer I/O whenever a newline character is found in
+		the output data stream.
+
+config CONFIG_LIB_HOMEDIR
+	string "Home directory"
+	default "/"
+	depends on !DISABLE_ENVIRON
+	---help---
+		The home directory to use with operations like such as 'cd ~'
+
 config HAVE_LIBM
-	bool "supports libm.a"
+	bool "Architecture-specific libm.a"
 	default n
+	---help---
+		Architecture specific logic provides an implementation of libm.a
+		and a math.h header file that can be found at include/arch/math.h.
 
 config NOPRINTF_FIELDWIDTH
-	bool "disable sprintf support fieldwidth"
+	bool "Disable sprintf support fieldwidth"
 	default n
 	---help---
 	sprintf-related logic is a
 	little smaller if we do not support fieldwidthes
 
 config LIBC_FLOATINGPOINT
-	bool "enable float point in printf"
+	bool "Enable floating point in printf"
 	default n
 	---help---
 		By default, floating point
 		support in printf, sscanf, etc. is disabled.
 
 config ARCH_LOWPUTC
-	bool "low-level console output"
+	bool "Low-level console output"
 	default "y"
 	---help---
 	  architecture supports low-level, boot time console output
 	  
 config ENABLE_ARCH_OPTIMIZED_FUN
-	bool "enable arch optimized function"
+	bool "Enable arch optimized functions"
 	default n
 	---help---
 		Allow for architecture optimized implementations
@@ -51,24 +76,31 @@ config ARCH_MEMCMP
 config ARCH_MEMMOVE
 	bool "memmove"
 	default n
+
 config ARCH_MEMSET
 	bool "memset"
 	default n
+
 config ARCH_STRCMP
 	bool "strcmp"
 	default n
+
 config ARCH_STRCPY
 	bool "strcpy"
 	default n
+
 config ARCH_STRNCPY
 	bool "strncpy"
 	default n
+
 config ARCH_STRLEN
 	bool "strlen"
 	default n
+
 config ARCH_STRNLEN
 	bool "strlen"
 	default n
+
 config ARCH_BZERO
 	bool "bzero"
 	default n
diff --git a/nuttx/libxx/Kconfig b/nuttx/libxx/Kconfig
index dad0444d1..4133a0ceb 100644
--- a/nuttx/libxx/Kconfig
+++ b/nuttx/libxx/Kconfig
@@ -2,18 +2,26 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
 config HAVE_CXX
-	bool "have cxx"
+	bool "Have C++ compiler"
 	default n
 	---help---
-		toolchain supports C++ and CXX, CXXFLAGS, and
-		COMPILEXX have been defined in the configurations Make.defs
-		file.
+		Toolchain supports C++ and CXX, CXXFLAGS, and COMPILEXX have been 
+		defined in the configurations Make.defs file.
 
 config HAVE_CXXINITIALIZE
-	bool "have cxx initialize"
+	bool "Have C++ initialization"
+	default n
+	---help---
+		The platform-specific logic includes support for initialization
+		of static C++ instances for this architecture and for the selected 
+		toolchain (via up_cxxinitialize()).
+
+config CXX_NEWLONG
+	bool "size_t is type long"
 	default n
 	---help---
-		The platform-specific logic includes support
-		for initialization of static C++ instances for this architecture
-		and for the selected toolchain (via up_cxxinitialize()).
+		size_t may be type long or type int.  This matters for some
+		C++ library routines because the NuttX size_t might not have
+		the same underlying type as your toolchain's size_t.