From ce6f574a9f3a3bdff8e06415a1c224d08c52cfbf Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 16 Jan 2026 16:08:20 +0000 Subject: [PATCH] [build] Canonicalise USB configuration Move all USB configuration from config/defaults/.h to the top-level config/usb.h, using indented conditional blocks to clarify which options are supported and enabled on each platform. Signed-off-by: Michael Brown --- src/config/defaults/efi.h | 6 ------ src/config/defaults/pcbios.h | 6 ------ src/config/usb.h | 32 +++++++++++++------------------- 3 files changed, 13 insertions(+), 31 deletions(-) diff --git a/src/config/defaults/efi.h b/src/config/defaults/efi.h index 2770626bc..e16c51c27 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 USB_HCD_XHCI /* xHCI USB host controller */ -#define USB_HCD_EHCI /* EHCI USB host controller */ -#define USB_HCD_UHCI /* UHCI USB host controller */ -#define USB_EFI /* Provide EFI_USB_IO_PROTOCOL interface */ -#define USB_BLOCK /* USB block devices */ - #if defined ( __i386__ ) || defined ( __x86_64__ ) #define IOAPI_X86 #define ENTROPY_RDRAND diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h index c067a440b..6fb2ab0e9 100644 --- a/src/config/defaults/pcbios.h +++ b/src/config/defaults/pcbios.h @@ -35,10 +35,4 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #define IOMAP_VIRT #endif -#define USB_HCD_XHCI /* xHCI USB host controller */ -#define USB_HCD_EHCI /* EHCI USB host controller */ -#define USB_HCD_UHCI /* UHCI USB host controller */ -#define USB_KEYBOARD /* USB keyboards */ -#define USB_BLOCK /* USB block devices */ - #endif /* CONFIG_DEFAULTS_PCBIOS_H */ diff --git a/src/config/usb.h b/src/config/usb.h index 09e0b82e6..c84f9e195 100644 --- a/src/config/usb.h +++ b/src/config/usb.h @@ -12,27 +12,21 @@ FILE_SECBOOT ( PERMITTED ); #include -/* - * USB host controllers (all enabled by default) - * - */ -//#undef USB_HCD_XHCI /* xHCI USB host controller */ -//#undef USB_HCD_EHCI /* EHCI USB host controller */ -//#undef USB_HCD_UHCI /* UHCI USB host controller */ -//#define USB_HCD_USBIO /* Very slow EFI USB host controller */ +/* USB host controllers */ +#define USB_HCD_EHCI /* EHCI USB host controller */ +#define USB_HCD_UHCI /* UHCI USB host controller */ +#define USB_HCD_XHCI /* xHCI USB host controller */ -/* - * USB peripherals - * - */ -//#undef USB_KEYBOARD /* USB keyboards */ -//#undef USB_BLOCK /* USB block devices */ +/* USB peripherals */ +#define USB_BLOCK /* USB block devices */ +#define USB_KEYBOARD /* USB keyboards */ -/* - * USB external interfaces - * - */ -//#undef USB_EFI /* Provide EFI_USB_IO_PROTOCOL interface */ +/* USB quirks on EFI platforms */ +#if defined ( PLATFORM_efi ) + #define USB_EFI /* Provide EFI_USB_IO_PROTOCOL interface */ + //#define USB_HCD_USBIO /* Very slow EFI USB pseudo-host controller */ + #undef USB_KEYBOARD /* Use built-in EFI keyboard driver */ +#endif #include #include NAMED_CONFIG(usb.h)