[build] Canonicalise SAN boot protocol configuration

Move all SAN boot 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 a17c91d05e67636cea2efc856ebc8aacb48ca0b9..119d8b160fc99efc59a8529e5db61775b612ac0e 100644 (file)
--- a/src/config/defaults/efi.h
+++ b/src/config/defaults/efi.h
@@ -30,12 +30,6 @@ FILE_SECBOOT ( PERMITTED );
 #define NAP_EFI
 #define SERIAL_SPCR
 
-#define        SANBOOT_PROTO_ISCSI     /* iSCSI protocol */
-#define        SANBOOT_PROTO_AOE       /* AoE protocol */
-#define        SANBOOT_PROTO_IB_SRP    /* Infiniband SCSI RDMA protocol */
-#define        SANBOOT_PROTO_FCP       /* Fibre Channel protocol */
-#define        SANBOOT_PROTO_HTTP      /* HTTP SAN protocol */
-
 #define        USB_HCD_XHCI            /* xHCI USB host controller */
 #define        USB_HCD_EHCI            /* EHCI USB host controller */
 #define        USB_HCD_UHCI            /* UHCI USB host controller */

diff --git a/src/config/defaults/linux.h b/src/config/defaults/linux.h
index 0eba7231ea9df4d57ef4e3e6247bc6f8d6589678..b632793817601472966faf9e7fb272030f8ae294 100644 (file)
--- a/src/config/defaults/linux.h
+++ b/src/config/defaults/linux.h
@@ -29,12 +29,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #define DRIVERS_LINUX
 
-#define SANBOOT_PROTO_ISCSI
-#define SANBOOT_PROTO_AOE
-#define SANBOOT_PROTO_IB_SRP
-#define SANBOOT_PROTO_FCP
-#define SANBOOT_PROTO_HTTP
-
 #if defined ( __i386__ ) || defined ( __x86_64__ )
 #define ENTROPY_RDRAND
 #endif

diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h
index f56fc9577e2e1d2b965da7556b49d2cda0d28f08..3a366aeb7efe4a943d3ac73d6c50f3a5962274f8 100644 (file)
--- a/src/config/defaults/pcbios.h
+++ b/src/config/defaults/pcbios.h
@@ -38,12 +38,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define PXE_STACK              /* PXE stack in iPXE - required for PXELINUX */
 #define PXE_MENU               /* PXE menu booting */
 
-#define        SANBOOT_PROTO_ISCSI     /* iSCSI protocol */
-#define        SANBOOT_PROTO_AOE       /* AoE protocol */
-#define        SANBOOT_PROTO_IB_SRP    /* Infiniband SCSI RDMA protocol */
-#define        SANBOOT_PROTO_FCP       /* Fibre Channel protocol */
-#define SANBOOT_PROTO_HTTP     /* HTTP SAN protocol */
-
 #define        USB_HCD_XHCI            /* xHCI USB host controller */
 #define        USB_HCD_EHCI            /* EHCI USB host controller */
 #define        USB_HCD_UHCI            /* UHCI USB host controller */

diff --git a/src/config/general.h b/src/config/general.h
index 3dd9f3fe0c0beff539f8c0329340f7598269de40..51bdcf1c58dbd39a163020a2c278a499b63c21dd 100644 (file)
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -77,16 +77,20 @@ FILE_SECBOOT ( PERMITTED );
   #define DOWNLOAD_PROTO_FILE  /* Local filesystem access */
 #endif
 
-/*
+/*****************************************************************************
+ *
  * SAN boot protocols
  *
  */
 
-//#undef       SANBOOT_PROTO_ISCSI     /* iSCSI protocol */
-//#undef       SANBOOT_PROTO_AOE       /* AoE protocol */
-//#undef       SANBOOT_PROTO_IB_SRP    /* Infiniband SCSI RDMA protocol */
-//#undef       SANBOOT_PROTO_FCP       /* Fibre Channel protocol */
-//#undef       SANBOOT_PROTO_HTTP      /* HTTP SAN protocol */
+/* Protocols supported on all platforms with SAN boot abstractions */
+#if ! defined ( SANBOOT_NULL )
+  #define SANBOOT_PROTO_AOE    /* AoE protocol */
+  #define SANBOOT_PROTO_FCP    /* Fibre Channel protocol */
+  #define SANBOOT_PROTO_HTTP   /* HTTP SAN protocol */
+  #define SANBOOT_PROTO_IB_SRP /* Infiniband SCSI RDMA protocol */
+  #define SANBOOT_PROTO_ISCSI  /* iSCSI protocol */
+#endif
 
 /*
  * HTTP extensions