sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-01-21 09:57:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

[build] Canonicalise network protocol configuration

Browse Source 
Move all network protocol selection from config/defaults/<platform>.h
to the top-level config/general.h, using indented conditional blocks
to clarify which protocols are supported and enabled on each platform.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2026-01-16 12:55:42 +00:00
parent e72c331aa7
commit f869132d6e
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/config/defaults/efi.h
View File

@@ -30,9 +30,6 @@ FILE_SECBOOT ( PERMITTED );
#define NAP_EFI #define NAP_EFI
#define SERIAL_SPCR #define SERIAL_SPCR
#define NET_PROTO_IPV6 /* IPv6 protocol */
#define NET_PROTO_LLDP /* Link Layer Discovery protocol */
#define DOWNLOAD_PROTO_FILE /* Local filesystem access */ #define DOWNLOAD_PROTO_FILE /* Local filesystem access */
#define SANBOOT_PROTO_ISCSI /* iSCSI protocol */ #define SANBOOT_PROTO_ISCSI /* iSCSI protocol */

22
src/config/general.h
View File

@@ -30,18 +30,26 @@ FILE_SECBOOT ( PERMITTED );
#define BANNER_TIMEOUT 20 #define BANNER_TIMEOUT 20
#define ROM_BANNER_TIMEOUT ( 2 * BANNER_TIMEOUT ) #define ROM_BANNER_TIMEOUT ( 2 * BANNER_TIMEOUT )
/* /*****************************************************************************
*
* Network protocols * Network protocols
* *
*/ */
#define NET_PROTO_IPV4 /* IPv4 protocol */ /* Protocols supported on all platforms */
//#define NET_PROTO_IPV6 /* IPv6 protocol */
#undef NET_PROTO_FCOE /* Fibre Channel over Ethernet protocol */
#define NET_PROTO_STP /* Spanning Tree protocol */
#define NET_PROTO_LACP /* Link Aggregation control protocol */
#define NET_PROTO_EAPOL /* EAP over LAN protocol */ #define NET_PROTO_EAPOL /* EAP over LAN protocol */
//#define NET_PROTO_LLDP /* Link Layer Discovery protocol */ //#define NET_PROTO_FCOE /* Fibre Channel over Ethernet protocol */
#define NET_PROTO_IPV4 /* IPv4 protocol */
#define NET_PROTO_IPV6 /* IPv6 protocol */
#define NET_PROTO_LACP /* Link Aggregation control protocol */
#define NET_PROTO_LLDP /* Link Layer Discovery protocol */
#define NET_PROTO_STP /* Spanning Tree protocol */
/* Disable protocols not historically included in 32-bit BIOS builds */
#if defined ( PLATFORM_pcbios ) && ! defined ( __x86_64__ )
#undef NET_PROTO_IPV6
#undef NET_PROTO_LLDP
#endif
/* /*
* PXE support * PXE support