diff --git a/src/config/defaults/efi.h b/src/config/defaults/efi.h
index 7899c160c..a17c91d05 100644
--- 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 3cafaa574..3dd9f3fe0 100644
--- 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