These changes are the raw update to qemu-2.6.

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

diff --git a/qemu/roms/ipxe/src/config/general.h b/qemu/roms/ipxe/src/config/general.h
index 5392034..ee15f6b 100644 (file)
--- a/qemu/roms/ipxe/src/config/general.h
+++ b/qemu/roms/ipxe/src/config/general.h
@@ -7,26 +7,10 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 
-/*
- * Branding
- *
- * Vendors may use these strings to add their own branding to iPXE.
- * PRODUCT_NAME is displayed prior to any iPXE branding in startup
- * messages, and PRODUCT_SHORT_NAME is used where a brief product
- * label is required (e.g. in BIOS boot selection menus).
- *
- * To minimise end-user confusion, it's probably a good idea to either
- * make PRODUCT_SHORT_NAME a substring of PRODUCT_NAME or leave it as
- * "iPXE".
- *
- */
-#define PRODUCT_NAME ""
-#define PRODUCT_SHORT_NAME "iPXE"
-
 /*
  * Banner timeout configuration
  *
@@ -53,6 +37,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define        NET_PROTO_IPV4          /* IPv4 protocol */
 #undef NET_PROTO_IPV6          /* IPv6 protocol */
 #undef NET_PROTO_FCOE          /* Fibre Channel over Ethernet protocol */
+#define        NET_PROTO_STP           /* Spanning Tree protocol */
 
 /*
  * PXE support
@@ -82,6 +67,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 //#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 */
+
+/*
+ * HTTP extensions
+ *
+ */
+#define HTTP_AUTH_BASIC                /* Basic authentication */
+#define HTTP_AUTH_DIGEST       /* Digest authentication */
+//#define HTTP_ENC_PEERDIST    /* PeerDist content encoding */
 
 /*
  * 802.11 cryptosystems and handshaking protocols
@@ -156,6 +150,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  */
 #undef NONPNP_HOOK_INT19       /* Hook INT19 on non-PnP BIOSes */
+#define        AUTOBOOT_ROM_FILTER     /* Autoboot only devices matching our ROM */
 
 /*
  * Error message tables to include
@@ -170,7 +165,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  */
 
-#define        NETDEV_DISCARD_RATE 0   /* Drop every N packets (0=>no drop) */
 #undef BUILD_SERIAL            /* Include an automatic build serial
                                 * number.  Add "bs" to the list of
                                 * make targets.  For example:
@@ -181,6 +175,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #undef GDBSERIAL               /* Remote GDB debugging over serial */
 #undef GDBUDP                  /* Remote GDB debugging over UDP
                                 * (both may be set) */
+//#define EFI_DOWNGRADE_UX     /* Downgrade UEFI user experience */
 
 #include <config/named.h>
 #include NAMED_CONFIG(general.h)