[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 6fd046f154f0e2c00c191ddb9fbc39520d8f6b94..e80355c70e02aef807b2aad56cd97ed8bb051656 100644 (file)
--- 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 7cd211e41ab8de61df667450078fff9670848e41..a2d6473c300ca66637c640060c0c303f365bc2fd 100644 (file)
--- 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
  *