diff options
| author | Michael Brown | 2005-05-02 13:13:47 +0200 |
|---|---|---|
| committer | Michael Brown | 2005-05-02 13:13:47 +0200 |
| commit | cc980d1c94f2f62b229a7560d1234b561ddebde6 (patch) | |
| tree | 467573830df0f6854f467b8193a063efb743c4b1 /src | |
| parent | More URL parsing moved into url.c (diff) | |
| download | ipxe-cc980d1c94f2f62b229a7560d1234b561ddebde6.tar.gz ipxe-cc980d1c94f2f62b229a7560d1234b561ddebde6.tar.xz ipxe-cc980d1c94f2f62b229a7560d1234b561ddebde6.zip | |
Moved DOWNLOAD_PROTO_XXX options to config.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/Config | 29 | ||||
| -rw-r--r-- | src/core/config.c | 20 | ||||
| -rw-r--r-- | src/include/etherboot.h | 4 |
3 files changed, 21 insertions, 32 deletions
diff --git a/src/Config b/src/Config index 989e9c038..8114837dd 100644 --- 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 9d40b15e3..fa49fdda7 100644 --- a/src/core/config.c +++ b/src/core/config.c @@ -171,6 +171,26 @@ 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 3fbf25115..8ae65bacf 100644 --- 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 |