From ecd838b81a19b7c40b31d5ce41d0c436b25f4984 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 9 Jan 2014 10:46:28 -0600 Subject: NSH Configuration: Refactor networking and netutils dependencies --- apps/ChangeLog.txt | 5 ++++- apps/netutils/dhcpc/Kconfig | 1 + apps/netutils/resolv/Kconfig | 1 + apps/netutils/telnetd/Kconfig | 1 + apps/nshlib/Kconfig | 7 ++++--- 5 files changed, 11 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index d2dd1df9d..4eeca46f8 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -754,4 +754,7 @@ * apps/examples/mount/Kconfig: Fill in empty Kconfig file (2013-12-31). * builtin/Makefile: Fixes for native Windows build from Max Holtzberg (2014-1-4). - + * apps/netutils/dhcpc/Kconfig, resolv/Kconfig, telnetd/Kconfig, and + apps/nshlib/Kconfig: Refactor some configuration dependencies: NSH + features should debug on netutil selections; netutil selections + should depend on networking selections. (2014-1-9). diff --git a/apps/netutils/dhcpc/Kconfig b/apps/netutils/dhcpc/Kconfig index 7453f2747..b4d3a1275 100644 --- a/apps/netutils/dhcpc/Kconfig +++ b/apps/netutils/dhcpc/Kconfig @@ -6,6 +6,7 @@ config NETUTILS_DHCPC bool "DHCP client" default n + depends on NET && NET_UDP && NET_BROADCAST ---help--- Enable support for the DHCP client. diff --git a/apps/netutils/resolv/Kconfig b/apps/netutils/resolv/Kconfig index b9e9b68b0..82fe3a81d 100644 --- a/apps/netutils/resolv/Kconfig +++ b/apps/netutils/resolv/Kconfig @@ -6,6 +6,7 @@ config NETUTILS_RESOLV bool "Name resolution" default n + depends on NET && NET_UDP && NET_BROADCAST ---help--- Enable support for the name resolution. diff --git a/apps/netutils/telnetd/Kconfig b/apps/netutils/telnetd/Kconfig index 8df8e907b..b582ed655 100644 --- a/apps/netutils/telnetd/Kconfig +++ b/apps/netutils/telnetd/Kconfig @@ -6,6 +6,7 @@ config NETUTILS_TELNETD bool "Telet daemon" default n + depends on NET && NET_TCP ---help--- Enable support for the Telnet daemon. diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig index b549a6c2a..7953cf681 100644 --- a/apps/nshlib/Kconfig +++ b/apps/nshlib/Kconfig @@ -558,7 +558,7 @@ config NSH_ARCHINIT config NSH_TELNET bool "Use Telnet console" default n - depends on NET && NET_TCP + depends on NETUTILS_TELNETD ---help--- If NSH_TELNET is set to 'y', then a TELENET server front-end is selected. When this option is provided, @@ -568,6 +568,7 @@ config NSH_TELNET endif if NSH_TELNET + config NSH_TELNETD_PORT int "Telnet port number" default 23 @@ -639,7 +640,7 @@ endif config NSH_DHCPC bool "Use DHCP to get IP address" default n - depends on NSH_LIBRARY && NET && NET_UDP && NET_BROADCAST + depends on NSH_LIBRARY && NETUTILS_DHCPC ---help--- Obtain the IP address via DHCP. @@ -674,7 +675,7 @@ config NSH_NETMASK config NSH_DNS bool "Use DNS" default n - depends on NSH_LIBRARY && NET && NET_UDP && NET_BROADCAST + depends on NSH_LIBRARY && NETUTILS_RESOLV ---help--- Configure to use a DNS. -- cgit v1.2.3