make tftp configurable in redboot

[Jani Monoses]

Gary,
 would something like this be OK with you?
It is an old patch so it does not apply
makes tftp optional in redboot.
I'll rediff and make a changelog unless you object to such crippling of redboot :)


Index: redboot//current/cdl/redboot.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/cdl/redboot.cdl,v
retrieving revision 1.43
diff -u -r1.43 redboot.cdl
--- redboot//current/cdl/redboot.cdl	24 Aug 2002 11:34:50 -0000	1.43
+++ redboot//current/cdl/redboot.cdl	28 Nov 2002 10:24:37 -0000
@@ -176,7 +176,7 @@
 
         cdl_option CYGBLD_BUILD_REDBOOT_WITH_EXEC {
             display       "Include exec command"
-            default_value 1
+            default_value 0
             # Implemented within the platform HAL
         }
 
@@ -207,7 +207,7 @@
         compile net/bootp.c net/udp.c net/ip.c net/pktbuf.c net/cksum.c
         compile net/enet.c net/icmp.c net/tcp.c net/timers.c net/arp.c
         compile net/net_io.c net/inet_addr.c
-        compile -library=libextras.a net/ping.c net/tftp_client.c 
+        compile -library=libextras.a net/ping.c
         description "This option includes networking support in RedBoot."
         define_proc {
             puts $::cdl_system_header "#define CYGNUM_HAL_VIRTUAL_VECTOR_AUX_CHANNELS 1"
@@ -219,6 +219,15 @@
             default_value    0
             description      "
                 This option is overriden by the configuration stored in flash."
+        }
+	
+	cdl_option CYGSEM_REDBOOT_NET_TFTP_DOWNLOAD {
+            display          "Support TFTP for download"
+            flavor           bool
+            default_value    1
+            compile          -library=libextras.a net/tftp_client.c
+            description      "
+                This option enables the use of the TFTP protocol for download"
         }
 
         cdl_option CYGSEM_REDBOOT_NET_HTTP_DOWNLOAD {
Index: redboot//current/src/load.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/load.c,v
retrieving revision 1.28
diff -u -r1.28 load.c
--- redboot//current/src/load.c	12 Sep 2002 21:23:11 -0000	1.28
+++ redboot//current/src/load.c	28 Nov 2002 10:24:40 -0000
@@ -60,7 +60,9 @@
 #include <fs/disk.h>
 #endif
 #ifdef CYGPKG_REDBOOT_NETWORKING
+#ifdef CYGSEM_REDBOOT_NET_TFTP_DOWNLOAD
 #include <net/tftp_support.h>
+#endif
 #ifdef CYGSEM_REDBOOT_NET_HTTP_DOWNLOAD
 #include <net/http.h>
 #endif
@@ -676,7 +678,11 @@
     } else {
         io_tab = (struct load_io_entry *)NULL;  // Default
 #ifdef CYGPKG_REDBOOT_NETWORKING
+#ifdef CYGSEM_REDBOOT_NET_TFTP_DOWNLOAD
         io = &tftp_io;
+#elif defined(CYGSEM_REDBOOT_NET_HTTP_DOWNLOAD)
+	io = &http_io;
+#endif	
 #else
         io = &xyzModem_io;
         verbose = false;