sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-01-22 03:32:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

[build] Canonicalise SAN boot protocol configuration

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

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

@@ -30,12 +30,6 @@ FILE_SECBOOT ( PERMITTED );
#define NAP_EFI #define NAP_EFI
#define SERIAL_SPCR #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_XHCI /* xHCI USB host controller */
#define USB_HCD_EHCI /* EHCI USB host controller */ #define USB_HCD_EHCI /* EHCI USB host controller */
#define USB_HCD_UHCI /* UHCI USB host controller */ #define USB_HCD_UHCI /* UHCI USB host controller */

6
src/config/defaults/linux.h
View File

@@ -29,12 +29,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define DRIVERS_LINUX #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__ ) #if defined ( __i386__ ) || defined ( __x86_64__ )
#define ENTROPY_RDRAND #define ENTROPY_RDRAND
#endif #endif

6
src/config/defaults/pcbios.h
View File

@@ -38,12 +38,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#define PXE_STACK /* PXE stack in iPXE - required for PXELINUX */ #define PXE_STACK /* PXE stack in iPXE - required for PXELINUX */
#define PXE_MENU /* PXE menu booting */ #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_XHCI /* xHCI USB host controller */
#define USB_HCD_EHCI /* EHCI USB host controller */ #define USB_HCD_EHCI /* EHCI USB host controller */
#define USB_HCD_UHCI /* UHCI USB host controller */ #define USB_HCD_UHCI /* UHCI USB host controller */

16
src/config/general.h
View File

@@ -77,16 +77,20 @@ FILE_SECBOOT ( PERMITTED );
#define DOWNLOAD_PROTO_FILE /* Local filesystem access */ #define DOWNLOAD_PROTO_FILE /* Local filesystem access */
#endif #endif
/* /*****************************************************************************
*
* SAN boot protocols * SAN boot protocols
* *
*/ */
//#undef SANBOOT_PROTO_ISCSI /* iSCSI protocol */ /* Protocols supported on all platforms with SAN boot abstractions */
//#undef SANBOOT_PROTO_AOE /* AoE protocol */ #if ! defined ( SANBOOT_NULL )
//#undef SANBOOT_PROTO_IB_SRP /* Infiniband SCSI RDMA protocol */ #define SANBOOT_PROTO_AOE /* AoE protocol */
//#undef SANBOOT_PROTO_FCP /* Fibre Channel protocol */ #define SANBOOT_PROTO_FCP /* Fibre Channel protocol */
//#undef SANBOOT_PROTO_HTTP /* HTTP SAN 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 * HTTP extensions