Selaa lähdekoodia

[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>
tags/v1.20.1
Michael Brown 12 vuotta sitten
vanhempi
commit
52e5ddce68
2 muutettua tiedostoa jossa 8 lisäystä ja 8 poistoa
  1. 8
    0
      src/core/settings.c
  2. 0
    8
      src/net/udp/tftp.c

+ 8
- 0
src/core/settings.c Näytä tiedosto

@@ -1798,6 +1798,14 @@ struct setting hostname_setting __setting ( SETTING_HOST ) = {
1798 1798
 	.type = &setting_type_string,
1799 1799
 };
1800 1800
 
1801
+/** TFTP server setting */
1802
+struct setting next_server_setting __setting ( SETTING_BOOT ) = {
1803
+	.name = "next-server",
1804
+	.description = "TFTP server",
1805
+	.tag = DHCP_EB_SIADDR,
1806
+	.type = &setting_type_ipv4,
1807
+};
1808
+
1801 1809
 /** Filename setting */
1802 1810
 struct setting filename_setting __setting ( SETTING_BOOT ) = {
1803 1811
 	.name = "filename",

+ 0
- 8
src/net/udp/tftp.c Näytä tiedosto

@@ -1214,14 +1214,6 @@ struct uri_opener mtftp_uri_opener __uri_opener = {
1214 1214
  ******************************************************************************
1215 1215
  */
1216 1216
 
1217
-/** TFTP server setting */
1218
-struct setting next_server_setting __setting ( SETTING_BOOT ) = {
1219
-	.name = "next-server",
1220
-	.description = "TFTP server",
1221
-	.tag = DHCP_EB_SIADDR,
1222
-	.type = &setting_type_ipv4,
1223
-};
1224
-
1225 1217
 /**
1226 1218
  * Apply TFTP configuration settings
1227 1219
  *

Loading…
Peruuta
Tallenna