[build] Canonicalise network protocol configuration

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>

diff --git a/src/config/defaults/efi.h b/src/config/defaults/efi.h
index 889d09c004e361732d1916c1c9c7ef92f2df75b0..7899c160c134ecc9d95f41e4f3b118a455c7f542 100644 (file)
--- a/src/config/defaults/efi.h
+++ b/src/config/defaults/efi.h
@@ -30,9 +30,6 @@ FILE_SECBOOT ( PERMITTED );
 #define NAP_EFI
 #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        SANBOOT_PROTO_ISCSI     /* iSCSI protocol */

diff --git a/src/config/general.h b/src/config/general.h
index 60b45ec35895f6f1f451c44835179244b0535f5b..3cafaa5744033679ac978c682278c99ce215d463 100644 (file)
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -30,18 +30,26 @@ FILE_SECBOOT ( PERMITTED );
 #define BANNER_TIMEOUT         20
 #define ROM_BANNER_TIMEOUT     ( 2 * BANNER_TIMEOUT )
 
-/*
+/*****************************************************************************
+ *
  * Network protocols
  *
  */
 
-#define        NET_PROTO_IPV4          /* IPv4 protocol */
-//#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_LLDP       /* Link Layer Discovery protocol */
+/* Protocols supported on all platforms */
+#define NET_PROTO_EAPOL                /* EAP over LAN 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