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 download protocol configuration

Browse Source 
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>
This commit is contained in:
Michael Brown
2026-01-16 13:37:36 +00:00
parent f869132d6e
commit 464916f99d
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,8 +30,6 @@ FILE_SECBOOT ( PERMITTED );
#define NAP_EFI #define NAP_EFI
#define SERIAL_SPCR #define SERIAL_SPCR
#define DOWNLOAD_PROTO_FILE /* Local filesystem access */
#define SANBOOT_PROTO_ISCSI /* iSCSI protocol */ #define SANBOOT_PROTO_ISCSI /* iSCSI protocol */
#define SANBOOT_PROTO_AOE /* AoE protocol */ #define SANBOOT_PROTO_AOE /* AoE protocol */
#define SANBOOT_PROTO_IB_SRP /* Infiniband SCSI RDMA protocol */ #define SANBOOT_PROTO_IB_SRP /* Infiniband SCSI RDMA protocol */

22
src/config/general.h
View File

@@ -58,18 +58,24 @@ FILE_SECBOOT ( PERMITTED );
//#undef PXE_STACK /* PXE stack in iPXE - you want this! */ //#undef PXE_STACK /* PXE stack in iPXE - you want this! */
//#undef PXE_MENU /* PXE menu booting */ //#undef PXE_MENU /* PXE menu booting */
/* /*****************************************************************************
*
* Download protocols * Download protocols
* *
*/ */
#define DOWNLOAD_PROTO_TFTP /* Trivial File Transfer Protocol */ /* Protocols supported on all platforms */
#define DOWNLOAD_PROTO_HTTP /* Hypertext Transfer Protocol */ #define DOWNLOAD_PROTO_TFTP /* Trivial File Transfer Protocol */
#undef DOWNLOAD_PROTO_HTTPS /* Secure Hypertext Transfer Protocol */ #define DOWNLOAD_PROTO_HTTP /* Hypertext Transfer Protocol */
#undef DOWNLOAD_PROTO_FTP /* File Transfer Protocol */ //#define DOWNLOAD_PROTO_HTTPS /* Secure Hypertext Transfer Protocol */
#undef DOWNLOAD_PROTO_SLAM /* Scalable Local Area Multicast */ //#define DOWNLOAD_PROTO_FTP /* File Transfer Protocol */
#undef DOWNLOAD_PROTO_NFS /* Network File System Protocol */ //#define DOWNLOAD_PROTO_SLAM /* Scalable Local Area Multicast */
//#undef DOWNLOAD_PROTO_FILE /* Local filesystem access */ //#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 * SAN boot protocols