[build] Canonicalise USB configuration

Move all USB configuration from config/defaults/<platform>.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 <mcb30@ipxe.org>

Author: mcb30

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

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 */

src/config/usb.h

@@ -12,27 +12,21 @@ FILE_SECBOOT ( PERMITTED );
 
 #include <config/defaults.h>
 
-/*
- * 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 peripherals
- *
- */
-//#undef	USB_KEYBOARD	/* USB keyboards */
-//#undef	USB_BLOCK	/* USB block devices */
-
-/*
- * USB external interfaces
- *
- */
-//#undef	USB_EFI		/* Provide EFI_USB_IO_PROTOCOL interface */
+/* 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 */
+#define USB_BLOCK		/* USB block devices */
+#define USB_KEYBOARD		/* USB keyboards */
+
+/* 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 <config/named.h>
 #include NAMED_CONFIG(usb.h)