X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=net%2FKconfig;h=a44a783cae239e54cd572149024f8c84743d726c;hb=90841dc21ed077a045c20dba660da8235a4fa577;hp=9a9846e187449c5dcda44e7c84de6b12add05640;hpb=9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a;p=people%2Fms%2Fu-boot.git

diff --git a/net/Kconfig b/net/Kconfig
index 9a9846e187..a44a783cae 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -4,7 +4,6 @@
 
 menuconfig NET
 	bool "Networking support"
-	select REGEX
 
 if NET
 
@@ -17,4 +16,20 @@ config NET_RANDOM_ETHADDR
 	  A new MAC address will be generated on every boot and it will
 	  not be added to the environment.
 
+config NETCONSOLE
+	bool "NetConsole support"
+	help
+	  Support the 'nc' input/output device for networked console.
+	  See README.NetConsole for details.
+
+config NET_TFTP_VARS
+	bool "Control TFTP timeout and count through environment"
+	default y
+	help
+	  If set, allows controlling the TFTP timeout through the
+	  environment variable tftptimeout, and the TFTP maximum
+	  timeout count through the variable tftptimeoutcountmax.
+	  If unset, timeout and maximum are hard-defined as 1 second
+	  and 10 timouts per TFTP transfer.
+
 endif   # if NET