These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / roms / ipxe / src / config / defaults / pcbios.h

diff --git a/qemu/roms/ipxe/src/config/defaults/pcbios.h b/qemu/roms/ipxe/src/config/defaults/pcbios.h
index 7debc8d..3ed8343 100644 (file)
--- a/qemu/roms/ipxe/src/config/defaults/pcbios.h
+++ b/qemu/roms/ipxe/src/config/defaults/pcbios.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #define UACCESS_LIBRM
 #define IOAPI_X86
@@ -35,6 +35,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #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 */
+#define        USB_KEYBOARD            /* USB keyboards */
 
 #define        REBOOT_CMD              /* Reboot command */
 #define        CPUID_CMD               /* x86 CPU feature detection command */