[build] Canonicalise download protocol configuration

Move all download 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 7899c160c134ecc9d95f41e4f3b118a455c7f542..a17c91d05e67636cea2efc856ebc8aacb48ca0b9 100644 (file)
--- a/src/config/defaults/efi.h
+++ b/src/config/defaults/efi.h
@@ -30,8 +30,6 @@ FILE_SECBOOT ( PERMITTED );
 #define NAP_EFI
 #define SERIAL_SPCR
 
-#define DOWNLOAD_PROTO_FILE    /* Local filesystem access */
-
 #define        SANBOOT_PROTO_ISCSI     /* iSCSI protocol */
 #define        SANBOOT_PROTO_AOE       /* AoE protocol */
 #define        SANBOOT_PROTO_IB_SRP    /* Infiniband SCSI RDMA protocol */

diff --git a/src/config/general.h b/src/config/general.h
index 3cafaa5744033679ac978c682278c99ce215d463..3dd9f3fe0c0beff539f8c0329340f7598269de40 100644 (file)
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -58,18 +58,24 @@ FILE_SECBOOT ( PERMITTED );
 //#undef       PXE_STACK               /* PXE stack in iPXE - you want this! */
 //#undef       PXE_MENU                /* PXE menu booting */
 
-/*
+/*****************************************************************************
+ *
  * Download protocols
  *
  */
 
-#define        DOWNLOAD_PROTO_TFTP     /* Trivial File Transfer Protocol */
-#define        DOWNLOAD_PROTO_HTTP     /* Hypertext Transfer Protocol */
-#undef DOWNLOAD_PROTO_HTTPS    /* Secure Hypertext Transfer Protocol */
-#undef DOWNLOAD_PROTO_FTP      /* File Transfer Protocol */
-#undef DOWNLOAD_PROTO_SLAM     /* Scalable Local Area Multicast */
-#undef DOWNLOAD_PROTO_NFS      /* Network File System Protocol */
-//#undef DOWNLOAD_PROTO_FILE   /* Local filesystem access */
+/* Protocols supported on all platforms */
+#define DOWNLOAD_PROTO_TFTP    /* Trivial File Transfer Protocol */
+#define DOWNLOAD_PROTO_HTTP    /* Hypertext Transfer Protocol */
+//#define DOWNLOAD_PROTO_HTTPS /* Secure Hypertext Transfer Protocol */
+//#define DOWNLOAD_PROTO_FTP   /* File Transfer Protocol */
+//#define DOWNLOAD_PROTO_SLAM  /* Scalable Local Area Multicast */
+//#define DOWNLOAD_PROTO_NFS   /* Network File System Protocol */
+
+/* Protocols supported only on platforms with filesystem abstractions */
+#if defined ( PLATFORM_efi )
+  #define DOWNLOAD_PROTO_FILE  /* Local filesystem access */
+#endif
 
 /*
  * SAN boot protocols