From 5286a4c849d2c764475fb8b175f8bb3b12f7f2d1 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 14 Apr 2012 18:01:45 +0000 Subject: [PATCH] Kconfig updates git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4608 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- apps/nshlib/Kconfig | 24 +++++++++++++++++++----- nuttx/drivers/Kconfig | 2 ++ nuttx/fs/Kconfig | 1 + nuttx/fs/fat/Kconfig | 4 ---- nuttx/fs/mmap/Kconfig | 23 ++++++++++++++++++++++- nuttx/fs/nfs/Kconfig | 26 +++++++++++++++++++++++++- nuttx/fs/nxffs/Kconfig | 4 ---- nuttx/fs/romfs/Kconfig | 10 +++++++++- nuttx/net/Kconfig | 18 ++++++------------ 9 files changed, 84 insertions(+), 28 deletions(-) diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig index 4a84148c95..c363e6c0b1 100644 --- a/apps/nshlib/Kconfig +++ b/apps/nshlib/Kconfig @@ -3,6 +3,14 @@ # see misc/tools/kconfig-language.txt. # +config NSH_LIBRARY + bool "NSH Library" + default n + ---help--- + Build the NSH support library. This is used, for example, by examples/nsh + in order to implement the full NuttShell (NSH). + +if NSH_LIBRARY config NSH_BUILTIN_APPS bool "Enable built-in applications" default y @@ -11,7 +19,7 @@ config NSH_BUILTIN_APPS executed from the NSH command line (see apps/README.txt for more information). -menu "Disable Commands" +menu "Disable Individual commands" config NSH_DISABLE_CAT bool "Disable cat" default n @@ -190,6 +198,8 @@ config NSH_ROMFSETC at /etc/init.d/rcS. The default startup script will mount a FAT FS RAMDISK at /tmp but the logic is easily extensible. +endif + if NSH_ROMFSETC config NSH_ROMFSMOUNTPT string "ROMFS mount point" @@ -257,6 +267,7 @@ config NSH_FATMOUNTPT FS will be mounted. Default is /tmp. endif +if NSH_LIBRARY config NSH_CONSOLE bool "Use console" default y @@ -314,6 +325,8 @@ config NSH_TELNET you may log into NuttX remotely using telnet in order to access NSH. +endif + if NSH_TELNET config NSH_TELNETD_PORT int "Telnet port number" @@ -357,17 +370,17 @@ endif config NSH_DHCPC bool "Use DHCP to get IP address" default n - depends on NET && NET_UDP && NET_BROADCAST + depends on NSH_LIBRARY && NET && NET_UDP && NET_BROADCAST ---help--- Obtain the IP address via DHCP. Per RFC2131 (p. 9), the DHCP client must be prepared to receive DHCP messages of up to 576 bytes (excluding Ethernet, IP, or UDP headers and FCS). -if !NSH_DHCPC config NSH_IPADDR hex "Target IP address" default 0x10000002 + depends on NSH_LIBRARY && NET && !NSH_DHCPC ---help--- If NSH_DHCPC is NOT set, then the static IP address must be provided. This is a 32-bit integer value in host order. So, as an example, @@ -376,6 +389,7 @@ config NSH_IPADDR config NSH_DRIPADDR hex "Router IP address" default 0x10000001 + depends on NSH_LIBRARY && NET && !NSH_DHCPC ---help--- Default router IP address (aka, Gateway). This is a 32-bit integer value in host order. So, as an example, 0x10000001 would be 10.0.0.1. @@ -383,15 +397,15 @@ config NSH_DRIPADDR config NSH_NETMASK hex "Network mask" default 0xffffff00 + depends on NSH_LIBRARY && NET && !NSH_DHCPC ---help--- Network mask. This is a 32-bit integer value in host order. So, as an example, 0xffffff00 would be 255.255.255.0. -endif config NSH_NOMAC bool "Hardware has no MAC address" default n - depends on NET + depends on NSH_LIBRARY && NET ---help--- Set if your ethernet hardware has no built-in MAC address. If set, a bogus MAC will be assigned. diff --git a/nuttx/drivers/Kconfig b/nuttx/drivers/Kconfig index e5fbd42d3b..9df512945b 100644 --- a/nuttx/drivers/Kconfig +++ b/nuttx/drivers/Kconfig @@ -3,6 +3,8 @@ # see misc/tools/kconfig-language.txt. # +comment "Device Driver Configuration" + config DEV_NULL bool "Enable /dev/null" default y diff --git a/nuttx/fs/Kconfig b/nuttx/fs/Kconfig index 2e1fd37837..afea337127 100644 --- a/nuttx/fs/Kconfig +++ b/nuttx/fs/Kconfig @@ -4,6 +4,7 @@ # comment "File system configuration" + source fs/fat/Kconfig source fs/mmap/Kconfig source fs/nfs/Kconfig diff --git a/nuttx/fs/fat/Kconfig b/nuttx/fs/fat/Kconfig index 4caf300b36..30983799d7 100644 --- a/nuttx/fs/fat/Kconfig +++ b/nuttx/fs/fat/Kconfig @@ -3,9 +3,6 @@ # see misc/tools/kconfig-language.txt. # -menu "FAT file system configuration" -comment "FAT file system configuration" - config FS_FAT bool "FAT file system" default n @@ -56,4 +53,3 @@ config FS_FATTIME hardware RTC or other way to get the time and date. endif -endmenu diff --git a/nuttx/fs/mmap/Kconfig b/nuttx/fs/mmap/Kconfig index a7b696c6a7..03482e2d81 100644 --- a/nuttx/fs/mmap/Kconfig +++ b/nuttx/fs/mmap/Kconfig @@ -3,4 +3,25 @@ # see misc/tools/kconfig-language.txt. # -comment "File mapping emulation" +config FS_RAMMAP + bool "File mapping emulation" + default n + ---help--- + NuttX operates in a flat open address space and is focused on MCUs that do + support Memory Management Units (MMUs). Therefore, NuttX generally does not + require mmap() functionality and the MCUs generally cannot support true + memory-mapped files. + + However, memory mapping of files is the mechanism used by NXFLAT, the NuttX + tiny binary format, to get files into memory in order to execute them. + mmap() support is therefore required to support NXFLAT. + + If FS_RAMMAP is defined in the configuration, then mmap() will + support simulation of memory mapped files by copying files whole + into RAM. These copied files have some of the properties of + standard memory mapped files. + + See nuttx/fs/mmap/README.txt for additonal information. + +if FS_RAMMAP +endif diff --git a/nuttx/fs/nfs/Kconfig b/nuttx/fs/nfs/Kconfig index 88a562cb35..841b1ab8ee 100644 --- a/nuttx/fs/nfs/Kconfig +++ b/nuttx/fs/nfs/Kconfig @@ -3,4 +3,28 @@ # see misc/tools/kconfig-language.txt. # -comment "Network file system (NFS) client file system" +config NFS + bool "NFS client file system" + default n + depends on NET && !DISABLE_MOUNTPOINT + ---help--- + Enable network file system (NFS) client file system + +#if NFS + +config NFS_TCPIP + bool "TCP/IP RPC support" + default n + depends on NFS + ---help--- + By default, NFS uses a UDP RPC protocol. Enable this option to + build in support for a TCP/IP-based RPC. + +config NFS_UNIX_AUTH + bool "NFS Unix authentication" + default n + depends on NFS + ---help--- + Build in support for Unix-style authentication. + +#endif \ No newline at end of file diff --git a/nuttx/fs/nxffs/Kconfig b/nuttx/fs/nxffs/Kconfig index f6aede4a21..b233e85ea0 100644 --- a/nuttx/fs/nxffs/Kconfig +++ b/nuttx/fs/nxffs/Kconfig @@ -3,9 +3,6 @@ # see misc/tools/kconfig-language.txt. # -menu "NXFFS file system configuration" -comment "NXFFS file system configuration" - config FS_NXFFS bool "NXFFS file system" default n @@ -52,4 +49,3 @@ config NXFFS_TAILTHRESHOLD Default: 8192. endif -endmenu diff --git a/nuttx/fs/romfs/Kconfig b/nuttx/fs/romfs/Kconfig index 22274681ad..6a91011abf 100644 --- a/nuttx/fs/romfs/Kconfig +++ b/nuttx/fs/romfs/Kconfig @@ -3,4 +3,12 @@ # see misc/tools/kconfig-language.txt. # -comment "ROMFS file system" +config FS_ROMFS + bool "ROMFS file system" + default n + depends on !DISABLE_MOUNTPOINT + ---help--- + Enable ROMFS filesystem support + +if FS_ROMFS +endif diff --git a/nuttx/net/Kconfig b/nuttx/net/Kconfig index b1c35dc60d..dc16150ba6 100644 --- a/nuttx/net/Kconfig +++ b/nuttx/net/Kconfig @@ -133,6 +133,12 @@ config NET_UDP_CONNS ---help--- The maximum amount of open concurrent UDP sockets +config NET_BROADCAST + bool "UDP broadcast Rx support" + default n + ---help--- + Incoming UDP broadcast support + endif config NET_ICMP @@ -202,18 +208,6 @@ config NET_ARP_IPIN Harvest IP/MAC address mappings from the ARP table from incoming IP packets. -endif -if NET_UDP - -config NET_BROADCAST - bool "UDP broadcast Rx support" - default n - ---help--- - Incoming UDP broadcast support - -endif -if NET - config NET_MULTICAST bool "Multi-cast Tx support" default n