Moved DOWNLOAD_PROTO_XXX options to config.h

diff --git a/src/Config b/src/Config
index 989e9c0..8114837 100644 (file)
--- a/src/Config
+++ b/src/Config
@@ -194,22 +194,6 @@
 #                      Support for sending multicast packets
 #      -DMULTICAST_LEVEL2
 #                      Support for receiving multicast packets
-#      -DDNS_RESOLVER
-#                      Support for resolving hostnames in bootfile name (experimental)
-#      -DDOWNLOAD_PROTO_TFTP
-#                      If defined, includes TFTP support (recommended).
-#      -DDOWNLOAD_PROTO_NFS
-#                      If defined, includes NFS support.
-#      -DDEFAULT_PROTO_NFS
-#                      If defined, makes NFS the default protocol instead
-#                      of TFTP. Requires DOWNLOAD_PROTO_NFS.
-#      -DDOWNLOAD_PROTO_SLAM
-#                      If defined, includes Scalable Local Area Multicast
-#                      support.
-#      -DDOWNLOAD_PROTO_TFTM
-#                      If defined, includes TFTP Multicast mode support.
-#      -DDOWNLOAD_PROTO_HTTP
-#                      If defined, includes HTTP support.
 #
 #      Interface export options:
 #
@@ -348,19 +332,8 @@ CFLAGS+=   -DTAGGED_IMAGE -DELF_IMAGE
 # CFLAGS+=     -DCOFF_IMAGE 
 # CFLAGS+=     -DRAW_IMAGE
 
-# Download files via TFTP
-CFLAGS+=       -DDOWNLOAD_PROTO_TFTP
-# Change download protocol to NFS, default is TFTP
-# CFLAGS+=     -DDOWNLOAD_PROTO_NFS
-# Change download protocol to HTTP, default is TFTP
-# CFLAGS+=     -DDOWNLOAD_PROTO_HTTP
-# Change default protocol to NFS
-# CFLAGS+=     -DDEFAULT_PROTO_NFS
-# Support to resolve hostnames in boot filename
-# CFLAGS+=     -DDNS_RESOLVER
-
 # Multicast Support
-# CFLAGS+=     -DALLMULTI -DMULTICAST_LEVEL1 -DMULTICAST_LEVEL2 -DDOWNLOAD_PROTO_TFTM
+# CFLAGS+=     -DALLMULTI -DMULTICAST_LEVEL1 -DMULTICAST_LEVEL2
 
 # Etherboot as a PXE network protocol ROM
 CFLAGS+=       -DPXE_IMAGE -DPXE_EXPORT

diff --git a/src/core/config.c b/src/core/config.c
index 9d40b15..fa49fdd 100644 (file)
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -170,6 +170,26 @@ REQUIRE_OBJECT ( pc_kbd );
 REQUIRE_OBJECT ( relocate );
 #endif
 
+/*
+ * Drag in all requested protocols
+ *
+ */
+#ifdef DOWNLOAD_PROTO_TFTP
+REQUIRE_OBJECT ( tftp );
+#endif
+#ifdef DOWNLOAD_PROTO_NFS
+REQUIRE_OBJECT ( nfs );
+#endif
+#ifdef DOWNLOAD_PROTO_HTTP
+REQUIRE_OBJECT ( http );
+#endif
+#ifdef DOWNLOAD_PROTO_TFTM
+REQUIRE_OBJECT ( tftm );
+#endif
+#ifdef DOWNLOAD_PROTO_SLAM
+REQUIRE_OBJECT ( slam );
+#endif
+
 /*
  * Drag in any required resolvers
  *

diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index 3fbf251..8ae65ba 100644 (file)
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@ -49,10 +49,6 @@
 #define DEFAULT_BOOTFILE       PXENFSROOTPATH "/boot/pxeboot"
 #endif
 
-#if    !defined(DOWNLOAD_PROTO_TFTP) && !defined(DOWNLOAD_PROTO_NFS) && !defined(DOWNLOAD_PROTO_SLAM) && !defined(DOWNLOAD_PROTO_TFTM) && !defined(DOWNLOAD_PROTO_DISK) && !defined(DOWNLOAD_PROTO_HTTP)
-#error No download protocol defined!
-#endif
-
 #ifndef        MAX_TFTP_RETRIES
 #define MAX_TFTP_RETRIES       20
 #endif