From: Michael Brown <mcb30@ipxe.org>
Date: Tue, 17 Apr 2012 10:50:11 +0000 (+0100)
Subject: [tftp] Allow builds without TFTP support
X-Git-Tag: v1.20.1~1847
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52e5ddce68adfe4afe3fe55ba317a2ba98d27b01;p=thirdparty%2Fipxe.git

[tftp] Allow builds without TFTP support

Allow TFTP to be configured out by moving the next-server setting
definition (which is used by autoboot.c) from tftp.c to settings.c.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/core/settings.c b/src/core/settings.c
index 6fd046f15..e80355c70 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -1798,6 +1798,14 @@ struct setting hostname_setting __setting ( SETTING_HOST ) = {
 	.type = &setting_type_string,
 };
 
+/** TFTP server setting */
+struct setting next_server_setting __setting ( SETTING_BOOT ) = {
+	.name = "next-server",
+	.description = "TFTP server",
+	.tag = DHCP_EB_SIADDR,
+	.type = &setting_type_ipv4,
+};
+
 /** Filename setting */
 struct setting filename_setting __setting ( SETTING_BOOT ) = {
 	.name = "filename",
diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c
index 7cd211e41..a2d6473c3 100644
--- a/src/net/udp/tftp.c
+++ b/src/net/udp/tftp.c
@@ -1214,14 +1214,6 @@ struct uri_opener mtftp_uri_opener __uri_opener = {
  ******************************************************************************
  */
 
-/** TFTP server setting */
-struct setting next_server_setting __setting ( SETTING_BOOT ) = {
-	.name = "next-server",
-	.description = "TFTP server",
-	.tag = DHCP_EB_SIADDR,
-	.type = &setting_type_ipv4,
-};
-
 /**
  * Apply TFTP configuration settings
  *