diff options
| author | Michael Brown | 2026-01-16 15:02:35 +0100 |
|---|---|---|
| committer | Michael Brown | 2026-01-16 15:02:35 +0100 |
| commit | d27cf68e070c8e9fb3aad2e0d60e3ddef998ea84 (patch) | |
| tree | 2ee4e666e44056bab06f96e998f6a43ad20e214b /src | |
| parent | [build] Canonicalise download protocol configuration (diff) | |
| download | ipxe-d27cf68e070c8e9fb3aad2e0d60e3ddef998ea84.tar.gz ipxe-d27cf68e070c8e9fb3aad2e0d60e3ddef998ea84.tar.xz ipxe-d27cf68e070c8e9fb3aad2e0d60e3ddef998ea84.zip | |
[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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/defaults/efi.h | 6 | ||||
| -rw-r--r-- | src/config/defaults/linux.h | 6 | ||||
| -rw-r--r-- | src/config/defaults/pcbios.h | 6 | ||||
| -rw-r--r-- | src/config/general.h | 16 |
4 files changed, 10 insertions, 24 deletions
diff --git a/src/config/defaults/efi.h b/src/config/defaults/efi.h index a17c91d05..119d8b160 100644 --- 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 0eba7231e..b63279381 100644 --- 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 f56fc9577..3a366aeb7 100644 --- 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 3dd9f3fe0..51bdcf1c5 100644 --- 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 |