Adding qemu as a submodule of KVMFORNFV

This Patch includes the changes to add qemu as a submodule to
kvmfornfv repo and make use of the updated latest qemu for the
execution of all testcase
Change-Id: I1280af507a857675c7f81d30c95255635667bdd7
Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>

13 files changed, 0 insertions, 2491 deletions

diff --git a/qemu/roms/seabios/src/std/LegacyBios.h b/qemu/roms/seabios/src/std/LegacyBios.h
deleted file mode 100644
index 5170c3786..000000000
--- a/qemu/roms/seabios/src/std/LegacyBios.h
+++ /dev/null
@@ -1,985 +0,0 @@
-/** @file
-  The EFI Legacy BIOS Protocol is used to abstract legacy Option ROM usage
-  under EFI and Legacy OS boot.  This file also includes all the related
-  COMPATIBILIY16 structures and defintions.
-
-  Note: The names for EFI_IA32_REGISTER_SET elements were picked to follow
-  well known naming conventions.
-
-  Thunk is the code that switches from 32-bit protected environment into the 16-bit real-mode
-	environment. Reverse thunk is the code that does the opposite.
-
-Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under 
-the terms and conditions of the BSD License that accompanies this distribution.  
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.                                          
-    
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  @par Revision Reference:
-  This protocol is defined in Framework for EFI Compatibility Support Module spec
-  Version 0.97.
-
-**/
-
-#ifndef _EFI_LEGACY_BIOS_H_
-#define _EFI_LEGACY_BIOS_H_
-
-///
-/// 
-///
-#pragma pack(1)
-
-typedef UINT8                       SERIAL_MODE;
-typedef UINT8                       PARALLEL_MODE;
-
-#define EFI_COMPATIBILITY16_TABLE_SIGNATURE SIGNATURE_32 ('I', 'F', 'E', '$')
-
-///
-/// There is a table located within the traditional BIOS in either the 0xF000:xxxx or 0xE000:xxxx
-/// physical address range. It is located on a 16-byte boundary and provides the physical address of the
-/// entry point for the Compatibility16 functions. These functions provide the platform-specific
-/// information that is required by the generic EfiCompatibility code. The functions are invoked via
-/// thunking by using EFI_LEGACY_BIOS_PROTOCOL.FarCall86() with the 32-bit physical
-/// entry point.
-///
-typedef struct {
-  ///
-  /// The string "$EFI" denotes the start of the EfiCompatibility table. Byte 0 is "I," byte
-  /// 1 is "F," byte 2 is "E," and byte 3 is "$" and is normally accessed as a DWORD or UINT32.
-  ///
-  UINT32                            Signature;
-  
-  ///
-  /// The value required such that byte checksum of TableLength equals zero.
-  ///
-  UINT8                             TableChecksum;
-  
-  ///
-  /// The length of this table.
-  ///
-  UINT8                             TableLength;
-  
-  ///
-  /// The major EFI revision for which this table was generated.
-  /// 
-  UINT8                             EfiMajorRevision;
-  
-  ///
-  /// The minor EFI revision for which this table was generated.
-  ///
-  UINT8                             EfiMinorRevision;
-  
-  ///
-  /// The major revision of this table.
-  ///
-  UINT8                             TableMajorRevision;
-  
-  ///
-  /// The minor revision of this table.
-  ///
-  UINT8                             TableMinorRevision;
-  
-  ///
-  /// Reserved for future usage.
-  ///
-  UINT16                            Reserved;
-  
-  ///
-  /// The segment of the entry point within the traditional BIOS for Compatibility16 functions.
-  ///
-  UINT16                            Compatibility16CallSegment;
-  
-  ///
-  /// The offset of the entry point within the traditional BIOS for Compatibility16 functions.
-  ///
-  UINT16                            Compatibility16CallOffset;
-  
-  ///
-  /// The segment of the entry point within the traditional BIOS for EfiCompatibility 
-  /// to invoke the PnP installation check.
-  ///
-  UINT16                            PnPInstallationCheckSegment;
-  
-  ///
-  /// The Offset of the entry point within the traditional BIOS for EfiCompatibility 
-  /// to invoke the PnP installation check.
-  ///
-  UINT16                            PnPInstallationCheckOffset;
-  
-  ///
-  /// EFI system resources table. Type EFI_SYSTEM_TABLE is defined in the IntelPlatform 
-  ///Innovation Framework for EFI Driver Execution Environment Core Interface Specification (DXE CIS).
-  ///
-  UINT32                            EfiSystemTable; 
-  
-  ///
-  /// The address of an OEM-provided identifier string. The string is null terminated.
-  ///
-  UINT32                            OemIdStringPointer;
-  
-  ///
-  /// The 32-bit physical address where ACPI RSD PTR is stored within the traditional
-  /// BIOS. The remained of the ACPI tables are located at their EFI addresses. The size
-  /// reserved is the maximum for ACPI 2.0. The EfiCompatibility will fill in the ACPI
-  /// RSD PTR with either the ACPI 1.0b or 2.0 values.
-  ///
-  UINT32                            AcpiRsdPtrPointer;
-  
-  ///
-  /// The OEM revision number. Usage is undefined but provided for OEM module usage.
-  ///
-  UINT16                            OemRevision;
-  
-  ///
-  /// The 32-bit physical address where INT15 E820 data is stored within the traditional
-  /// BIOS. The EfiCompatibility code will fill in the E820Pointer value and copy the
-  /// data to the indicated area.
-  ///
-  UINT32                            E820Pointer;
-  
-  ///
-  /// The length of the E820 data and is filled in by the EfiCompatibility code.
-  ///
-  UINT32                            E820Length;
-  
-  ///
-  /// The 32-bit physical address where the $PIR table is stored in the traditional BIOS.
-  /// The EfiCompatibility code will fill in the IrqRoutingTablePointer value and
-  /// copy the data to the indicated area.
-  ///
-  UINT32                            IrqRoutingTablePointer;
-  
-  ///
-  /// The length of the $PIR table and is filled in by the EfiCompatibility code.
-  ///
-  UINT32                            IrqRoutingTableLength;
-  
-  ///
-  /// The 32-bit physical address where the MP table is stored in the traditional BIOS.
-  /// The EfiCompatibility code will fill in the MpTablePtr value and copy the data 
-  /// to the indicated area.
-  ///
-  UINT32                            MpTablePtr;
-  
-  ///
-  /// The length of the MP table and is filled in by the EfiCompatibility code.
-  ///
-  UINT32                            MpTableLength;
-  
-  ///
-  /// The segment of the OEM-specific INT table/code.
-  /// 
-  UINT16                            OemIntSegment;
-  
-  ///
-  /// The offset of the OEM-specific INT table/code.
-  ///
-  UINT16                            OemIntOffset;
-  
-  ///
-  /// The segment of the OEM-specific 32-bit table/code.
-  ///
-  UINT16                            Oem32Segment;
-  
-  ///
-  /// The offset of the OEM-specific 32-bit table/code.
-  ///
-  UINT16                            Oem32Offset;
-  
-  ///
-  /// The segment of the OEM-specific 16-bit table/code.
-  ///
-  UINT16                            Oem16Segment;
-  
-  ///
-  /// The offset of the OEM-specific 16-bit table/code.
-  ///
-  UINT16                            Oem16Offset;
-  
-  ///
-  /// The segment of the TPM binary passed to 16-bit CSM.
-  ///
-  UINT16                            TpmSegment;
-  
-  ///
-  /// The offset of the TPM binary passed to 16-bit CSM.
-  ///
-  UINT16                            TpmOffset;
-  
-  ///
-  /// A pointer to a string identifying the independent BIOS vendor.
-  ///
-  UINT32                            IbvPointer;
-  
-  ///
-  /// This field is NULL for all systems not supporting PCI Express. This field is the base
-  /// value of the start of the PCI Express memory-mapped configuration registers and
-  /// must be filled in prior to EfiCompatibility code issuing the Compatibility16 function
-  /// Compatibility16InitializeYourself().
-  /// Compatibility16InitializeYourself() is defined in Compatability16
-  /// Functions.
-  ///
-  UINT32                            PciExpressBase;
-  
-  ///
-  /// Maximum PCI bus number assigned.
-  ///
-  UINT8                             LastPciBus;
-
-  ///
-  /// Start address of UMB RAM
-  ///
-  UINT32                            UmaAddress;
-
-  ///
-  /// Size of UMB RAM
-  ///
-  UINT32                            UmaSize;
-
-  ///
-  /// Start address of persistent allocation in high (>1MiB) memory
-  ///
-  UINT32                            HiPermanentMemoryAddress;
-
-  ///
-  /// Size of persistent allocation in high (>1MiB) memory
-  ///
-  UINT32                            HiPermanentMemorySize;
-} EFI_COMPATIBILITY16_TABLE;
-
-///
-/// Functions provided by the CSM binary which communicate between the EfiCompatibility 
-/// and Compatability16 code.
-///
-/// Inconsistent with the specification here: 
-/// The member's name started with "Compatibility16" [defined in Intel Framework 
-/// Compatibility Support Module Specification / 0.97 version] 
-/// has been changed to "Legacy16" since keeping backward compatible.
-///
-typedef enum {
-  ///
-  /// Causes the Compatibility16 code to do any internal initialization required.
-  /// Input:
-  ///   AX = Compatibility16InitializeYourself
-  ///   ES:BX = Pointer to EFI_TO_COMPATIBILITY16_INIT_TABLE
-  /// Return:
-  ///   AX = Return Status codes
-  ///
-  Legacy16InitializeYourself    = 0x0000,
-  
-  ///
-  /// Causes the Compatibility16 BIOS to perform any drive number translations to match the boot sequence.
-  /// Input:
-  ///   AX = Compatibility16UpdateBbs
-  ///   ES:BX = Pointer to EFI_TO_COMPATIBILITY16_BOOT_TABLE
-  /// Return:
-  ///   AX = Returned status codes
-  ///
-  Legacy16UpdateBbs             = 0x0001,
-  
-  ///
-  /// Allows the Compatibility16 code to perform any final actions before booting. The Compatibility16
-  /// code is read/write.
-  /// Input:
-  ///   AX = Compatibility16PrepareToBoot
-  ///   ES:BX = Pointer to EFI_TO_COMPATIBILITY16_BOOT_TABLE structure  
-  /// Return:
-  ///   AX = Returned status codes
-  ///
-  Legacy16PrepareToBoot         = 0x0002,
-  
-  ///
-  /// Causes the Compatibility16 BIOS to boot. The Compatibility16 code is Read/Only.
-  /// Input:
-  ///   AX = Compatibility16Boot
-  /// Output:
-  ///   AX = Returned status codes
-  ///
-  Legacy16Boot                  = 0x0003,
-  
-  ///
-  /// Allows the Compatibility16 code to get the last device from which a boot was attempted. This is
-  /// stored in CMOS and is the priority number of the last attempted boot device.
-  /// Input:
-  ///   AX = Compatibility16RetrieveLastBootDevice
-  /// Output:
-  ///   AX = Returned status codes
-  ///   BX = Priority number of the boot device.
-  ///
-  Legacy16RetrieveLastBootDevice = 0x0004,
-  
-  ///
-  /// Allows the Compatibility16 code rehook INT13, INT18, and/or INT19 after dispatching a legacy OpROM.
-  /// Input:
-  ///   AX = Compatibility16DispatchOprom
-  ///   ES:BX = Pointer to EFI_DISPATCH_OPROM_TABLE
-  /// Output:
-  ///   AX = Returned status codes
-  ///   BX = Number of non-BBS-compliant devices found. Equals 0 if BBS compliant.
-  ///
-  Legacy16DispatchOprom         = 0x0005,
-  
-  ///
-  /// Finds a free area in the 0xFxxxx or 0xExxxx region of the specified length and returns the address
-  /// of that region.
-  /// Input:
-  ///   AX = Compatibility16GetTableAddress
-  ///   BX = Allocation region
-  ///       00 = Allocate from either 0xE0000 or 0xF0000 64 KB blocks.
-  ///       Bit 0 = 1 Allocate from 0xF0000 64 KB block
-  ///       Bit 1 = 1 Allocate from 0xE0000 64 KB block
-  ///   CX = Requested length in bytes.
-  ///   DX = Required address alignment. Bit mapped. First non-zero bit from the right is the alignment.
-  /// Output:
-  ///   AX = Returned status codes
-  ///   DS:BX = Address of the region
-  ///
-  Legacy16GetTableAddress       = 0x0006,
-  
-  ///
-  /// Enables the EfiCompatibility module to do any nonstandard processing of keyboard LEDs or state.
-  /// Input:
-  ///   AX = Compatibility16SetKeyboardLeds
-  ///   CL = LED status.
-  ///     Bit 0  Scroll Lock 0 = Off
-  ///     Bit 1  NumLock
-  ///     Bit 2  Caps Lock
-  /// Output:
-  ///     AX = Returned status codes
-  ///
-  Legacy16SetKeyboardLeds       = 0x0007,
-  
-  ///
-  /// Enables the EfiCompatibility module to install an interrupt handler for PCI mass media devices that
-  /// do not have an OpROM associated with them. An example is SATA.
-  /// Input:
-  ///   AX = Compatibility16InstallPciHandler
-  ///   ES:BX = Pointer to EFI_LEGACY_INSTALL_PCI_HANDLER structure
-  /// Output:
-  ///   AX = Returned status codes
-  ///
-  Legacy16InstallPciHandler     = 0x0008
-} EFI_COMPATIBILITY_FUNCTIONS;
-
-
-///
-/// EFI_DISPATCH_OPROM_TABLE
-///
-typedef struct {
-  UINT16  PnPInstallationCheckSegment;  ///< A pointer to the PnpInstallationCheck data structure.
-  UINT16  PnPInstallationCheckOffset;   ///< A pointer to the PnpInstallationCheck data structure.
-  UINT16  OpromSegment;                 ///< The segment where the OpROM was placed. Offset is assumed to be 3.
-  UINT8   PciBus;                       ///< The PCI bus.
-  UINT8   PciDeviceFunction;            ///< The PCI device * 0x08 | PCI function.
-  UINT8   NumberBbsEntries;             ///< The number of valid BBS table entries upon entry and exit. The IBV code may
-                                        ///< increase this number, if BBS-compliant devices also hook INTs in order to force the
-                                        ///< OpROM BIOS Setup to be executed.
-  UINT32  BbsTablePointer;              ///< A pointer to the BBS table.
-  UINT16  RuntimeSegment;               ///< The segment where the OpROM can be relocated to. If this value is 0x0000, this
-                                        ///< means that the relocation of this run time code is not supported.
-                                        ///< Inconsistent with specification here: 
-                                        ///< The member's name "OpromDestinationSegment" [defined in Intel Framework Compatibility Support Module Specification / 0.97 version] 
-                                        ///< has been changed to "RuntimeSegment" since keeping backward compatible.
-
-} EFI_DISPATCH_OPROM_TABLE;
-
-///
-/// EFI_TO_COMPATIBILITY16_INIT_TABLE
-///
-typedef struct {
-  ///
-  /// Starting address of memory under 1 MB. The ending address is assumed to be 640 KB or 0x9FFFF.
-  ///
-  UINT32                            BiosLessThan1MB;
-  
-  ///
-  /// The starting address of the high memory block.
-  ///
-  UINT32                            HiPmmMemory;
-  
-  ///
-  /// The length of high memory block.
-  ///
-  UINT32                            HiPmmMemorySizeInBytes;
-  
-  ///
-  /// The segment of the reverse thunk call code.
-  ///
-  UINT16                            ReverseThunkCallSegment;
-  
-  ///
-  /// The offset of the reverse thunk call code.
-  ///
-  UINT16                            ReverseThunkCallOffset;
-  
-  ///
-  /// The number of E820 entries copied to the Compatibility16 BIOS.
-  ///
-  UINT32                            NumberE820Entries;
-  
-  ///
-  /// The amount of usable memory above 1 MB, e.g., E820 type 1 memory.
-  ///
-  UINT32                            OsMemoryAbove1Mb;
-  
-  ///
-  /// The start of thunk code in main memory. Memory cannot be used by BIOS or PMM.
-  ///
-  UINT32                            ThunkStart;
-  
-  ///
-  /// The size of the thunk code.
-  ///
-  UINT32                            ThunkSizeInBytes;
-  
-  ///
-  /// Starting address of memory under 1 MB.
-  ///
-  UINT32                            LowPmmMemory;
-  
-  ///
-  /// The length of low Memory block.
-  ///
-  UINT32                            LowPmmMemorySizeInBytes;
-} EFI_TO_COMPATIBILITY16_INIT_TABLE;
-
-///
-/// DEVICE_PRODUCER_SERIAL.
-///
-typedef struct {
-  UINT16                            Address;    ///< I/O address assigned to the serial port.
-  UINT8                             Irq;        ///< IRQ assigned to the serial port.
-  SERIAL_MODE                       Mode;       ///< Mode of serial port. Values are defined below.
-} DEVICE_PRODUCER_SERIAL;
-
-///
-/// DEVICE_PRODUCER_SERIAL's modes.
-///@{
-#define DEVICE_SERIAL_MODE_NORMAL               0x00
-#define DEVICE_SERIAL_MODE_IRDA                 0x01
-#define DEVICE_SERIAL_MODE_ASK_IR               0x02
-#define DEVICE_SERIAL_MODE_DUPLEX_HALF          0x00
-#define DEVICE_SERIAL_MODE_DUPLEX_FULL          0x10
-///@)
-
-///
-/// DEVICE_PRODUCER_PARALLEL.
-///
-typedef struct {
-  UINT16                            Address;  ///< I/O address assigned to the parallel port.
-  UINT8                             Irq;      ///< IRQ assigned to the parallel port.
-  UINT8                             Dma;      ///< DMA assigned to the parallel port.
-  PARALLEL_MODE                     Mode;     ///< Mode of the parallel port. Values are defined below.
-} DEVICE_PRODUCER_PARALLEL;
-
-///
-/// DEVICE_PRODUCER_PARALLEL's modes.
-///@{
-#define DEVICE_PARALLEL_MODE_MODE_OUTPUT_ONLY   0x00
-#define DEVICE_PARALLEL_MODE_MODE_BIDIRECTIONAL 0x01
-#define DEVICE_PARALLEL_MODE_MODE_EPP           0x02
-#define DEVICE_PARALLEL_MODE_MODE_ECP           0x03
-///@}
-
-///
-/// DEVICE_PRODUCER_FLOPPY
-///
-typedef struct {
-  UINT16                            Address;          ///< I/O address assigned to the floppy.
-  UINT8                             Irq;              ///< IRQ assigned to the floppy.
-  UINT8                             Dma;              ///< DMA assigned to the floppy.
-  UINT8                             NumberOfFloppy;   ///< Number of floppies in the system.
-} DEVICE_PRODUCER_FLOPPY;
-
-///
-/// LEGACY_DEVICE_FLAGS
-///
-typedef struct {
-  UINT32                            A20Kybd : 1;      ///< A20 controller by keyboard controller.
-  UINT32                            A20Port90 : 1;    ///< A20 controlled by port 0x92.
-  UINT32                            Reserved : 30;    ///< Reserved for future usage.
-} LEGACY_DEVICE_FLAGS;
-
-///
-/// DEVICE_PRODUCER_DATA_HEADER
-///
-typedef struct {
-  DEVICE_PRODUCER_SERIAL            Serial[4];      ///< Data for serial port x. Type DEVICE_PRODUCER_SERIAL is defined below.
-  DEVICE_PRODUCER_PARALLEL          Parallel[3];    ///< Data for parallel port x. Type DEVICE_PRODUCER_PARALLEL is defined below.
-  DEVICE_PRODUCER_FLOPPY            Floppy;         ///< Data for floppy. Type DEVICE_PRODUCER_FLOPPY is defined below.
-  UINT8                             MousePresent;   ///< Flag to indicate if mouse is present.
-  LEGACY_DEVICE_FLAGS               Flags;          ///< Miscellaneous Boolean state information passed to CSM.
-} DEVICE_PRODUCER_DATA_HEADER;
-
-///
-/// ATAPI_IDENTIFY
-///
-typedef struct {
-  UINT16                            Raw[256];     ///< Raw data from the IDE IdentifyDrive command.
-} ATAPI_IDENTIFY;
-
-///
-/// HDD_INFO
-///
-typedef struct {
-  ///
-  /// Status of IDE device. Values are defined below. There is one HDD_INFO structure
-  /// per IDE controller. The IdentifyDrive is per drive. Index 0 is master and index
-  /// 1 is slave.
-  ///
-  UINT16                            Status;   
-  
-  ///
-  /// PCI bus of IDE controller.
-  ///
-  UINT32                            Bus;
-  
-  ///
-  /// PCI device of IDE controller.
-  ///
-  UINT32                            Device;
-  
-  ///
-  /// PCI function of IDE controller.
-  ///
-  UINT32                            Function;
-  
-  ///
-  /// Command ports base address.
-  ///
-  UINT16                            CommandBaseAddress;
-  
-  ///
-  /// Control ports base address.
-  ///
-  UINT16                            ControlBaseAddress;
-  
-  ///
-  /// Bus master address.
-  ///
-  UINT16                            BusMasterAddress;
-  
-  UINT8                             HddIrq;
-  
-  ///
-  /// Data that identifies the drive data; one per possible attached drive.
-  ///
-  ATAPI_IDENTIFY                    IdentifyDrive[2];
-} HDD_INFO;
-
-///
-/// HDD_INFO status bits
-///
-#define HDD_PRIMARY               0x01
-#define HDD_SECONDARY             0x02
-#define HDD_MASTER_ATAPI_CDROM    0x04
-#define HDD_SLAVE_ATAPI_CDROM     0x08
-#define HDD_MASTER_IDE            0x20
-#define HDD_SLAVE_IDE             0x40
-#define HDD_MASTER_ATAPI_ZIPDISK  0x10
-#define HDD_SLAVE_ATAPI_ZIPDISK   0x80
-
-///
-/// BBS_STATUS_FLAGS;\.
-///
-typedef struct {
-  UINT16                            OldPosition : 4;    ///< Prior priority.
-  UINT16                            Reserved1 : 4;      ///< Reserved for future use.
-  UINT16                            Enabled : 1;        ///< If 0, ignore this entry.
-  UINT16                            Failed : 1;         ///< 0 = Not known if boot failure occurred.
-                                                        ///< 1 = Boot attempted failed.
-  
-  ///
-  /// State of media present.
-  ///   00 = No bootable media is present in the device.
-  ///   01 = Unknown if a bootable media present.
-  ///   10 = Media is present and appears bootable.
-  ///   11 = Reserved.
-  ///
-  UINT16                            MediaPresent : 2;
-  UINT16                            Reserved2 : 4;      ///< Reserved for future use.
-} BBS_STATUS_FLAGS;
-
-///
-/// BBS_TABLE, device type values & boot priority values.
-///
-typedef struct {
-  ///
-  /// The boot priority for this boot device. Values are defined below.
-  ///
-  UINT16                            BootPriority;
-  
-  ///
-  /// The PCI bus for this boot device.
-  ///
-  UINT32                            Bus;
-  
-  ///
-  /// The PCI device for this boot device.
-  ///
-  UINT32                            Device;
-  
-  ///
-  /// The PCI function for the boot device.
-  ///
-  UINT32                            Function;
-  
-  ///
-  /// The PCI class for this boot device.
-  ///
-  UINT8                             Class;
-  
-  ///
-  /// The PCI Subclass for this boot device.
-  ///
-  UINT8                             SubClass;
-  
-  ///
-  /// Segment:offset address of an ASCIIZ description string describing the manufacturer.
-  ///
-  UINT16                            MfgStringOffset;
-  
-  ///
-  /// Segment:offset address of an ASCIIZ description string describing the manufacturer.
-  ///  
-  UINT16                            MfgStringSegment;
-  
-  ///
-  /// BBS device type. BBS device types are defined below.
-  ///
-  UINT16                            DeviceType;
-  
-  ///
-  /// Status of this boot device. Type BBS_STATUS_FLAGS is defined below.
-  ///
-  BBS_STATUS_FLAGS                  StatusFlags;
-  
-  ///
-  /// Segment:Offset address of boot loader for IPL devices or install INT13 handler for
-  /// BCV devices.
-  ///
-  UINT16                            BootHandlerOffset;
-  
-  ///
-  /// Segment:Offset address of boot loader for IPL devices or install INT13 handler for
-  /// BCV devices.
-  ///  
-  UINT16                            BootHandlerSegment;
-  
-  ///
-  /// Segment:offset address of an ASCIIZ description string describing this device.
-  ///
-  UINT16                            DescStringOffset;
-
-  ///
-  /// Segment:offset address of an ASCIIZ description string describing this device.
-  ///
-  UINT16                            DescStringSegment;
-  
-  ///
-  /// Reserved.
-  ///
-  UINT32                            InitPerReserved;
-  
-  ///
-  /// The use of these fields is IBV dependent. They can be used to flag that an OpROM
-  /// has hooked the specified IRQ. The OpROM may be BBS compliant as some SCSI
-  /// BBS-compliant OpROMs also hook IRQ vectors in order to run their BIOS Setup
-  ///
-  UINT32                            AdditionalIrq13Handler;
-  
-  ///
-  /// The use of these fields is IBV dependent. They can be used to flag that an OpROM
-  /// has hooked the specified IRQ. The OpROM may be BBS compliant as some SCSI
-  /// BBS-compliant OpROMs also hook IRQ vectors in order to run their BIOS Setup
-  ///  
-  UINT32                            AdditionalIrq18Handler;
-  
-  ///
-  /// The use of these fields is IBV dependent. They can be used to flag that an OpROM
-  /// has hooked the specified IRQ. The OpROM may be BBS compliant as some SCSI
-  /// BBS-compliant OpROMs also hook IRQ vectors in order to run their BIOS Setup
-  ///  
-  UINT32                            AdditionalIrq19Handler;
-  
-  ///
-  /// The use of these fields is IBV dependent. They can be used to flag that an OpROM
-  /// has hooked the specified IRQ. The OpROM may be BBS compliant as some SCSI
-  /// BBS-compliant OpROMs also hook IRQ vectors in order to run their BIOS Setup
-  ///  
-  UINT32                            AdditionalIrq40Handler;
-  UINT8                             AssignedDriveNumber;
-  UINT32                            AdditionalIrq41Handler;
-  UINT32                            AdditionalIrq46Handler;
-  UINT32                            IBV1;
-  UINT32                            IBV2;
-} BBS_TABLE;
-
-///
-/// BBS device type values
-///@{
-#define BBS_FLOPPY              0x01
-#define BBS_HARDDISK            0x02
-#define BBS_CDROM               0x03
-#define BBS_PCMCIA              0x04
-#define BBS_USB                 0x05
-#define BBS_EMBED_NETWORK       0x06
-#define BBS_BEV_DEVICE          0x80
-#define BBS_UNKNOWN             0xff
-///@}
-
-///
-/// BBS boot priority values
-///@{
-#define BBS_DO_NOT_BOOT_FROM    0xFFFC
-#define BBS_LOWEST_PRIORITY     0xFFFD
-#define BBS_UNPRIORITIZED_ENTRY 0xFFFE
-#define BBS_IGNORE_ENTRY        0xFFFF
-///@}
-
-///
-/// SMM_ATTRIBUTES
-///
-typedef struct {
-  ///
-  /// Access mechanism used to generate the soft SMI. Defined types are below. The other
-  /// values are reserved for future usage.
-  ///
-  UINT16                            Type : 3;
-  
-  ///
-  /// The size of "port" in bits. Defined values are below.
-  ///
-  UINT16                            PortGranularity : 3;
-  
-  ///
-  /// The size of data in bits. Defined values are below.
-  ///
-  UINT16                            DataGranularity : 3;
-  
-  ///
-  /// Reserved for future use.
-  ///
-  UINT16                            Reserved : 7;
-} SMM_ATTRIBUTES;
-
-///
-/// SMM_ATTRIBUTES type values.
-///@{
-#define STANDARD_IO       0x00
-#define STANDARD_MEMORY   0x01
-///@}
-
-///
-/// SMM_ATTRIBUTES port size constants.
-///@{
-#define PORT_SIZE_8       0x00
-#define PORT_SIZE_16      0x01
-#define PORT_SIZE_32      0x02
-#define PORT_SIZE_64      0x03
-///@}
-
-///
-/// SMM_ATTRIBUTES data size constants.
-///@{
-#define DATA_SIZE_8       0x00
-#define DATA_SIZE_16      0x01
-#define DATA_SIZE_32      0x02
-#define DATA_SIZE_64      0x03
-///@}
-
-///
-/// SMM_FUNCTION & relating constants.
-///
-typedef struct {
-  UINT16                            Function : 15;
-  UINT16                            Owner : 1;
-} SMM_FUNCTION;
-
-///
-/// SMM_FUNCTION Function constants.
-///@{
-#define INT15_D042        0x0000
-#define GET_USB_BOOT_INFO 0x0001
-#define DMI_PNP_50_57     0x0002
-///@}
-
-///
-/// SMM_FUNCTION Owner constants.
-///@{
-#define STANDARD_OWNER    0x0
-#define OEM_OWNER         0x1
-///@}
-
-///
-/// This structure assumes both port and data sizes are 1. SmmAttribute must be
-/// properly to reflect that assumption.
-///
-typedef struct {
-  ///
-  /// Describes the access mechanism, SmmPort, and SmmData sizes. Type
-  /// SMM_ATTRIBUTES is defined below.
-  ///
-  SMM_ATTRIBUTES                    SmmAttributes;
-  
-  ///
-  /// Function Soft SMI is to perform. Type SMM_FUNCTION is defined below.
-  ///
-  SMM_FUNCTION                      SmmFunction;
-  
-  ///
-  /// SmmPort size depends upon SmmAttributes and ranges from2 bytes to 16 bytes.
-  ///
-  UINT8                             SmmPort;
-  
-  ///
-  /// SmmData size depends upon SmmAttributes and ranges from2 bytes to 16 bytes.
-  ///
-  UINT8                             SmmData;
-} SMM_ENTRY;
-
-///
-/// SMM_TABLE
-///
-typedef struct {
-  UINT16                            NumSmmEntries;    ///< Number of entries represented by SmmEntry.
-  SMM_ENTRY                         SmmEntry;         ///< One entry per function. Type SMM_ENTRY is defined below.
-} SMM_TABLE;
-
-///
-/// UDC_ATTRIBUTES
-///
-typedef struct {
-  ///
-  /// This bit set indicates that the ServiceAreaData is valid.
-  ///
-  UINT8                             DirectoryServiceValidity : 1;
-  
-  ///
-  /// This bit set indicates to use the Reserve Area Boot Code Address (RACBA) only if
-  /// DirectoryServiceValidity is 0.
-  ///
-  UINT8                             RabcaUsedFlag : 1;
-  
-  ///
-  /// This bit set indicates to execute hard disk diagnostics.
-  ///
-  UINT8                             ExecuteHddDiagnosticsFlag : 1;
-  
-  ///
-  /// Reserved for future use. Set to 0.
-  ///
-  UINT8                             Reserved : 5;
-} UDC_ATTRIBUTES;
-
-///
-/// UD_TABLE
-///
-typedef struct {
-  ///
-  /// This field contains the bit-mapped attributes of the PARTIES information. Type
-  /// UDC_ATTRIBUTES is defined below.
-  ///
-  UDC_ATTRIBUTES                    Attributes;
-  
-  ///
-  /// This field contains the zero-based device on which the selected
-  /// ServiceDataArea is present. It is 0 for master and 1 for the slave device.  
-  ///
-  UINT8                             DeviceNumber;
-  
-  ///
-  /// This field contains the zero-based index into the BbsTable for the parent device.
-  /// This index allows the user to reference the parent device information such as PCI
-  /// bus, device function.
-  ///
-  UINT8                             BbsTableEntryNumberForParentDevice;
-  
-  ///
-  /// This field contains the zero-based index into the BbsTable for the boot entry.
-  ///
-  UINT8                             BbsTableEntryNumberForBoot;
-  
-  ///
-  /// This field contains the zero-based index into the BbsTable for the HDD diagnostics entry.
-  ///
-  UINT8                             BbsTableEntryNumberForHddDiag;
-  
-  ///
-  /// The raw Beer data.
-  ///
-  UINT8                             BeerData[128];
-  
-  ///
-  /// The raw data of selected service area.
-  ///
-  UINT8                             ServiceAreaData[64];
-} UD_TABLE;
-
-#define EFI_TO_LEGACY_MAJOR_VERSION 0x02
-#define EFI_TO_LEGACY_MINOR_VERSION 0x00
-#define MAX_IDE_CONTROLLER          8
-
-///
-/// EFI_TO_COMPATIBILITY16_BOOT_TABLE
-///
-typedef struct {
-  UINT16                            MajorVersion;                 ///< The EfiCompatibility major version number.
-  UINT16                            MinorVersion;                 ///< The EfiCompatibility minor version number.
-  UINT32                            AcpiTable;                    ///< The location of the RSDT ACPI table. < 4G range.
-  UINT32                            SmbiosTable;                  ///< The location of the SMBIOS table in EFI memory. < 4G range.
-  UINT32                            SmbiosTableLength;
-  //
-  // Legacy SIO state
-  //
-  DEVICE_PRODUCER_DATA_HEADER       SioData;                      ///< Standard traditional device information.
-  UINT16                            DevicePathType;               ///< The default boot type.
-  UINT16                            PciIrqMask;                   ///< Mask of which IRQs have been assigned to PCI.
-  UINT32                            NumberE820Entries;            ///< Number of E820 entries. The number can change from the
-                                                                  ///< Compatibility16InitializeYourself() function.
-  //
-  // Controller & Drive Identify[2] per controller information
-  //
-  HDD_INFO                          HddInfo[MAX_IDE_CONTROLLER];  ///< Hard disk drive information, including raw Identify Drive data.
-  UINT32                            NumberBbsEntries;             ///< Number of entries in the BBS table
-  UINT32                            BbsTable;                     ///< A pointer to the BBS table. Type BBS_TABLE is defined below.
-  UINT32                            SmmTable;                     ///< A pointer to the SMM table. Type SMM_TABLE is defined below.
-  UINT32                            OsMemoryAbove1Mb;             ///< The amount of usable memory above 1 MB, i.e. E820 type 1 memory. This value can
-                                                                  ///< differ from the value in EFI_TO_COMPATIBILITY16_INIT_TABLE as more
-                                                                  ///< memory may have been discovered.
-  UINT32                            UnconventionalDeviceTable;    ///< Information to boot off an unconventional device like a PARTIES partition. Type
-                                                                  ///< UD_TABLE is defined below.
-} EFI_TO_COMPATIBILITY16_BOOT_TABLE;
-
-///
-/// EFI_LEGACY_INSTALL_PCI_HANDLER
-///
-typedef struct {
-  UINT8                             PciBus;             ///< The PCI bus of the device.
-  UINT8                             PciDeviceFun;       ///< The PCI device in bits 7:3 and function in bits 2:0.
-  UINT8                             PciSegment;         ///< The PCI segment of the device.
-  UINT8                             PciClass;           ///< The PCI class code of the device.
-  UINT8                             PciSubclass;        ///< The PCI subclass code of the device.
-  UINT8                             PciInterface;       ///< The PCI interface code of the device.
-  //
-  // Primary section
-  //
-  UINT8                             PrimaryIrq;         ///< The primary device IRQ.
-  UINT8                             PrimaryReserved;    ///< Reserved.
-  UINT16                            PrimaryControl;     ///< The primary device control I/O base.
-  UINT16                            PrimaryBase;        ///< The primary device I/O base.
-  UINT16                            PrimaryBusMaster;   ///< The primary device bus master I/O base.
-  //
-  // Secondary Section
-  //
-  UINT8                             SecondaryIrq;       ///< The secondary device IRQ.
-  UINT8                             SecondaryReserved;  ///< Reserved.
-  UINT16                            SecondaryControl;   ///< The secondary device control I/O base.
-  UINT16                            SecondaryBase;      ///< The secondary device I/O base.
-  UINT16                            SecondaryBusMaster; ///< The secondary device bus master I/O base.
-} EFI_LEGACY_INSTALL_PCI_HANDLER;
-
-#endif
diff --git a/qemu/roms/seabios/src/std/acpi.h b/qemu/roms/seabios/src/std/acpi.h
deleted file mode 100644
index b672bbee4..000000000
--- a/qemu/roms/seabios/src/std/acpi.h
+++ /dev/null
@@ -1,317 +0,0 @@
-#ifndef __ACPI_H
-#define __ACPI_H
-
-#include "types.h" // u32
-
-/*
- * ACPI 2.0 Generic Address Space definition.
- */
-struct acpi_20_generic_address {
-    u8  address_space_id;
-    u8  register_bit_width;
-    u8  register_bit_offset;
-    u8  reserved;
-    u64 address;
-} PACKED;
-
-#define RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR "
-
-struct rsdp_descriptor {        /* Root System Descriptor Pointer */
-    u64 signature;              /* ACPI signature, contains "RSD PTR " */
-    u8  checksum;               /* To make sum of struct == 0 */
-    u8  oem_id [6];             /* OEM identification */
-    u8  revision;               /* Must be 0 for 1.0, 2 for 2.0 */
-    u32 rsdt_physical_address;  /* 32-bit physical address of RSDT */
-    u32 length;                 /* XSDT Length in bytes including hdr */
-    u64 xsdt_physical_address;  /* 64-bit physical address of XSDT */
-    u8  extended_checksum;      /* Checksum of entire table */
-    u8  reserved [3];           /* Reserved field must be 0 */
-};
-
-/* Table structure from Linux kernel (the ACPI tables are under the
-   BSD license) */
-
-#define ACPI_TABLE_HEADER_DEF   /* ACPI common table header */ \
-    u32 signature;          /* ACPI signature (4 ASCII characters) */ \
-    u32 length;                 /* Length of table, in bytes, including header */ \
-    u8  revision;               /* ACPI Specification minor version # */ \
-    u8  checksum;               /* To make sum of entire table == 0 */ \
-    u8  oem_id [6];             /* OEM identification */ \
-    u8  oem_table_id [8];       /* OEM table identification */ \
-    u32 oem_revision;           /* OEM revision number */ \
-    u8  asl_compiler_id [4];    /* ASL compiler vendor ID */ \
-    u32 asl_compiler_revision;  /* ASL compiler revision number */
-
-/*
- * Fixed ACPI Description Table Fixed Feature Flags
- */
-#define    ACPI_FADT_F_WBINVD            (1 << 0)
-#define    ACPI_FADT_F_WBINVD_FLUSH      (1 << 1)
-#define    ACPI_FADT_F_PROC_C1           (1 << 2)
-#define    ACPI_FADT_F_P_LVL2_UP         (1 << 3)
-#define    ACPI_FADT_F_PWR_BUTTON        (1 << 4)
-#define    ACPI_FADT_F_SLP_BUTTON        (1 << 5)
-#define    ACPI_FADT_F_FIX_RTC           (1 << 6)
-#define    ACPI_FADT_F_RTC_S4            (1 << 7)
-#define    ACPI_FADT_F_TMR_VAL_EXT       (1 << 8)
-#define    ACPI_FADT_F_DCK_CAP           (1 << 9)
-#define    ACPI_FADT_F_RESET_REG_SUP     (1 << 10)
-#define    ACPI_FADT_F_SEALED_CASE       (1 << 11)
-#define    ACPI_FADT_F_HEADLESS          (1 << 12)
-#define    ACPI_FADT_F_CPU_SW_SLP        (1 << 13)
-#define    ACPI_FADT_F_PCI_EXP_WAK       (1 << 14)
-#define    ACPI_FADT_F_USE_PLATFORM_CLOCK (1 << 15)
-#define    ACPI_FADT_F_S4_RTC_STS_VALID   (1 << 16)
-#define    ACPI_FADT_F_REMOTE_POWER_ON_CAPABLE  (1 << 17)
-#define    ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL  (1 << 18)
-#define    ACPI_FADT_F_FORCE_APIC_PHYSICAL_DESTINATION_MODE  (1 << 19)
-#define    ACPI_FADT_F_HW_REDUCED_ACPI    (1 << 20)
-#define    ACPI_FADT_F_LOW_POWER_S0_IDLE_CAPABLE  (1 << 21)
-
-/*
- * ACPI 1.0 Fixed ACPI Description Table (FADT)
- */
-#define FACP_SIGNATURE 0x50434146 // FACP
-struct fadt_descriptor_rev1
-{
-    ACPI_TABLE_HEADER_DEF     /* ACPI common table header */
-    u32 firmware_ctrl;          /* Physical address of FACS */
-    u32 dsdt;                   /* Physical address of DSDT */
-    u8  model;                  /* System Interrupt Model */
-    u8  reserved1;              /* Reserved */
-    u16 sci_int;                /* System vector of SCI interrupt */
-    u32 smi_cmd;                /* Port address of SMI command port */
-    u8  acpi_enable;            /* Value to write to smi_cmd to enable ACPI */
-    u8  acpi_disable;           /* Value to write to smi_cmd to disable ACPI */
-    u8  S4bios_req;             /* Value to write to SMI CMD to enter S4BIOS state */
-    u8  reserved2;              /* Reserved - must be zero */
-    u32 pm1a_evt_blk;           /* Port address of Power Mgt 1a acpi_event Reg Blk */
-    u32 pm1b_evt_blk;           /* Port address of Power Mgt 1b acpi_event Reg Blk */
-    u32 pm1a_cnt_blk;           /* Port address of Power Mgt 1a Control Reg Blk */
-    u32 pm1b_cnt_blk;           /* Port address of Power Mgt 1b Control Reg Blk */
-    u32 pm2_cnt_blk;            /* Port address of Power Mgt 2 Control Reg Blk */
-    u32 pm_tmr_blk;             /* Port address of Power Mgt Timer Ctrl Reg Blk */
-    u32 gpe0_blk;               /* Port addr of General Purpose acpi_event 0 Reg Blk */
-    u32 gpe1_blk;               /* Port addr of General Purpose acpi_event 1 Reg Blk */
-    u8  pm1_evt_len;            /* Byte length of ports at pm1_x_evt_blk */
-    u8  pm1_cnt_len;            /* Byte length of ports at pm1_x_cnt_blk */
-    u8  pm2_cnt_len;            /* Byte Length of ports at pm2_cnt_blk */
-    u8  pm_tmr_len;             /* Byte Length of ports at pm_tm_blk */
-    u8  gpe0_blk_len;           /* Byte Length of ports at gpe0_blk */
-    u8  gpe1_blk_len;           /* Byte Length of ports at gpe1_blk */
-    u8  gpe1_base;              /* Offset in gpe model where gpe1 events start */
-    u8  reserved3;              /* Reserved */
-    u16 plvl2_lat;              /* Worst case HW latency to enter/exit C2 state */
-    u16 plvl3_lat;              /* Worst case HW latency to enter/exit C3 state */
-    u16 flush_size;             /* Size of area read to flush caches */
-    u16 flush_stride;           /* Stride used in flushing caches */
-    u8  duty_offset;            /* Bit location of duty cycle field in p_cnt reg */
-    u8  duty_width;             /* Bit width of duty cycle field in p_cnt reg */
-    u8  day_alrm;               /* Index to day-of-month alarm in RTC CMOS RAM */
-    u8  mon_alrm;               /* Index to month-of-year alarm in RTC CMOS RAM */
-    u8  century;                /* Index to century in RTC CMOS RAM */
-    u8  reserved4;              /* Reserved */
-    u8  reserved4a;             /* Reserved */
-    u8  reserved4b;             /* Reserved */
-    u32 flags;
-} PACKED;
-
-struct acpi_table_header         /* ACPI common table header */
-{
-    ACPI_TABLE_HEADER_DEF
-} PACKED;
-
-/*
- * ACPI 1.0 Root System Description Table (RSDT)
- */
-#define RSDT_SIGNATURE 0x54445352 // RSDT
-struct rsdt_descriptor_rev1
-{
-    ACPI_TABLE_HEADER_DEF       /* ACPI common table header */
-    u32 table_offset_entry[0];  /* Array of pointers to other */
-    /* ACPI tables */
-} PACKED;
-
-/*
- * ACPI 1.0 Firmware ACPI Control Structure (FACS)
- */
-#define FACS_SIGNATURE 0x53434146 // FACS
-struct facs_descriptor_rev1
-{
-    u32 signature;           /* ACPI Signature */
-    u32 length;                 /* Length of structure, in bytes */
-    u32 hardware_signature;     /* Hardware configuration signature */
-    u32 firmware_waking_vector; /* ACPI OS waking vector */
-    u32 global_lock;            /* Global Lock */
-    u32 flags;
-    u8  resverved3 [40];        /* Reserved - must be zero */
-} PACKED;
-
-/*
- * Differentiated System Description Table (DSDT)
- */
-#define DSDT_SIGNATURE 0x54445344 // DSDT
-
-/*
- * MADT values and structures
- */
-
-/* Values for MADT PCATCompat */
-
-#define DUAL_PIC                0
-#define MULTIPLE_APIC           1
-
-/* Master MADT */
-
-#define APIC_SIGNATURE 0x43495041 // APIC
-struct multiple_apic_table
-{
-    ACPI_TABLE_HEADER_DEF     /* ACPI common table header */
-    u32 local_apic_address;     /* Physical address of local APIC */
-    u32 flags;
-} PACKED;
-
-/* Values for Type in APIC sub-headers */
-
-#define APIC_PROCESSOR          0
-#define APIC_IO                 1
-#define APIC_XRUPT_OVERRIDE     2
-#define APIC_NMI                3
-#define APIC_LOCAL_NMI          4
-#define APIC_ADDRESS_OVERRIDE   5
-#define APIC_IO_SAPIC           6
-#define APIC_LOCAL_SAPIC        7
-#define APIC_XRUPT_SOURCE       8
-#define APIC_RESERVED           9           /* 9 and greater are reserved */
-
-/*
- * MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE)
- */
-#define ACPI_SUB_HEADER_DEF   /* Common ACPI sub-structure header */\
-    u8  type;                               \
-    u8  length;
-
-/* Sub-structures for MADT */
-
-struct madt_processor_apic
-{
-    ACPI_SUB_HEADER_DEF
-    u8  processor_id;           /* ACPI processor id */
-    u8  local_apic_id;          /* Processor's local APIC id */
-    u32 flags;
-} PACKED;
-
-struct madt_io_apic
-{
-    ACPI_SUB_HEADER_DEF
-    u8  io_apic_id;             /* I/O APIC ID */
-    u8  reserved;               /* Reserved - must be zero */
-    u32 address;                /* APIC physical address */
-    u32 interrupt;              /* Global system interrupt where INTI
-                                 * lines start */
-} PACKED;
-
-struct madt_intsrcovr {
-    ACPI_SUB_HEADER_DEF
-    u8  bus;
-    u8  source;
-    u32 gsi;
-    u16 flags;
-} PACKED;
-
-struct madt_local_nmi {
-    ACPI_SUB_HEADER_DEF
-    u8  processor_id;           /* ACPI processor id */
-    u16 flags;                  /* MPS INTI flags */
-    u8  lint;                   /* Local APIC LINT# */
-} PACKED;
-
-/*
- * HPET Description Table
- */
-#define HPET_SIGNATURE 0x54455048 // HPET
-struct acpi_20_hpet {
-    ACPI_TABLE_HEADER_DEF                    /* ACPI common table header */
-    u32           timer_block_id;
-    struct acpi_20_generic_address addr;
-    u8            hpet_number;
-    u16           min_tick;
-    u8            page_protect;
-} PACKED;
-
-/*
- * SRAT (NUMA topology description) table
- */
-
-#define SRAT_SIGNATURE 0x54415253 // SRAT
-struct system_resource_affinity_table
-{
-    ACPI_TABLE_HEADER_DEF
-    u32    reserved1;
-    u32    reserved2[2];
-} PACKED;
-
-#define SRAT_PROCESSOR          0
-#define SRAT_MEMORY             1
-
-struct srat_processor_affinity
-{
-    ACPI_SUB_HEADER_DEF
-    u8     proximity_lo;
-    u8     local_apic_id;
-    u32    flags;
-    u8     local_sapic_eid;
-    u8     proximity_hi[3];
-    u32    reserved;
-} PACKED;
-
-struct srat_memory_affinity
-{
-    ACPI_SUB_HEADER_DEF
-    u8     proximity[4];
-    u16    reserved1;
-    u64    base_addr;
-    u64    range_length;
-    u32    reserved2;
-    u32    flags;
-    u32    reserved3[2];
-} PACKED;
-
-/* PCI fw r3.0 MCFG table. */
-/* Subtable */
-struct acpi_mcfg_allocation {
-    u64 address;                /* Base address, processor-relative */
-    u16 pci_segment;            /* PCI segment group number */
-    u8 start_bus_number;       /* Starting PCI Bus number */
-    u8 end_bus_number;         /* Final PCI Bus number */
-    u32 reserved;
-} PACKED;
-
-#define MCFG_SIGNATURE 0x4746434d       // MCFG
-struct acpi_table_mcfg {
-    ACPI_TABLE_HEADER_DEF;
-    u8 reserved[8];
-    struct acpi_mcfg_allocation allocation[0];
-} PACKED;
-
-
-struct rsdt_descriptor {
-    ACPI_TABLE_HEADER_DEF
-    u32 entry[1];
-} PACKED;
-
-#define TCPA_SIGNATURE 0x41504354
-struct tcpa_descriptor_rev2
-{
-    ACPI_TABLE_HEADER_DEF
-    u16  platform_class;
-    u32  log_area_minimum_length;
-    u64  log_area_start_address;
-} PACKED;
-
-/* TCPA ACPI definitions */
-#define TCPA_ACPI_CLASS_CLIENT          0
-#define TCPA_ACPI_CLASS_SERVER          1
-
-
-#endif // acpi.h
diff --git a/qemu/roms/seabios/src/std/bda.h b/qemu/roms/seabios/src/std/bda.h
deleted file mode 100644
index 4ad6605d4..000000000
--- a/qemu/roms/seabios/src/std/bda.h
+++ /dev/null
@@ -1,154 +0,0 @@
-// BIOS Data Area (and similar) definitions
-#ifndef __BDA_H
-#define __BDA_H
-
-#include "disk.h" // struct fdpt_s
-#include "types.h" // u8
-
-
-/****************************************************************
- * Interrupt vector table
- ****************************************************************/
-
-struct rmode_IVT {
-    struct segoff_s ivec[256];
-};
-
-
-/****************************************************************
- * Bios Data Area (BDA)
- ****************************************************************/
-
-struct bios_data_area_s {
-    // 40:00
-    u16 port_com[4];
-    u16 port_lpt[3];
-    u16 ebda_seg;
-    // 40:10
-    u16 equipment_list_flags;
-    u8 pad1;
-    u16 mem_size_kb;
-    u8 pad2;
-    u8 ps2_ctrl_flag;
-    u8 kbd_flag0;
-    u8 kbd_flag1;
-    u8 alt_keypad;
-    u16 kbd_buf_head;
-    u16 kbd_buf_tail;
-    // 40:1e
-    u8 kbd_buf[32];
-    u8 floppy_recalibration_status;
-    u8 floppy_motor_status;
-    // 40:40
-    u8 floppy_motor_counter;
-    u8 floppy_last_status;
-    u8 floppy_return_status[7];
-    u8 video_mode;
-    u16 video_cols;
-    u16 video_pagesize;
-    u16 video_pagestart;
-    // 40:50
-    u16 cursor_pos[8];
-    // 40:60
-    u16 cursor_type;
-    u8 video_page;
-    u16 crtc_address;
-    u8 video_msr;
-    u8 video_pal;
-    struct segoff_s jump;
-    u8 other_6b;
-    u32 timer_counter;
-    // 40:70
-    u8 timer_rollover;
-    u8 break_flag;
-    u16 soft_reset_flag;
-    u8 disk_last_status;
-    u8 hdcount;
-    u8 disk_control_byte;
-    u8 port_disk;
-    u8 lpt_timeout[4];
-    u8 com_timeout[4];
-    // 40:80
-    u16 kbd_buf_start_offset;
-    u16 kbd_buf_end_offset;
-    u8 video_rows;
-    u16 char_height;
-    u8 video_ctl;
-    u8 video_switches;
-    u8 modeset_ctl;
-    u8 dcc_index;
-    u8 floppy_last_data_rate;
-    u8 disk_status_controller;
-    u8 disk_error_controller;
-    u8 disk_interrupt_flag;
-    u8 floppy_harddisk_info;
-    // 40:90
-    u8 floppy_media_state[4];
-    u8 floppy_track[2];
-    u8 kbd_flag2;
-    u8 kbd_led;
-    struct segoff_s user_wait_complete_flag;
-    u32 user_wait_timeout;
-    // 40:A0
-    u8 rtc_wait_flag;
-    u8 other_a1[7];
-    struct segoff_s video_savetable;
-    u8 other_ac[4];
-    // 40:B0
-    u8 other_b0[5*16];
-} PACKED;
-
-// BDA floppy_recalibration_status bitdefs
-#define FRS_IRQ (1<<7)
-
-// BDA rtc_wait_flag bitdefs
-#define RWS_WAIT_PENDING (1<<0)
-#define RWS_WAIT_ELAPSED (1<<7)
-
-// BDA floppy_media_state bitdefs
-#define FMS_DRIVE_STATE_MASK        (0x07)
-#define FMS_MEDIA_DRIVE_ESTABLISHED (1<<4)
-#define FMS_DOUBLE_STEPPING         (1<<5)
-#define FMS_DATA_RATE_MASK          (0xc0)
-
-// Limit of BDA timer_counter field
-#define TICKS_PER_DAY 1573040
-
-
-/****************************************************************
- * Extended Bios Data Area (EBDA)
- ****************************************************************/
-
-struct extended_bios_data_area_s {
-    u8 size;
-    u8 reserved1[0x21];
-    struct segoff_s far_call_pointer;
-    u8 mouse_flag1;
-    u8 mouse_flag2;
-    u8 mouse_data[0x08];
-    // 0x30
-    u8 other1[0x0d];
-
-    // 0x3d
-    struct fdpt_s fdpt[2];
-
-    // 0x5d
-    u8 other2[0xC4];
-
-    // 0x121 - Begin custom storage.
-} PACKED;
-
-
-/****************************************************************
- * Bios Config Table
- ****************************************************************/
-
-struct bios_config_table_s {
-    u16 size;
-    u8 model;
-    u8 submodel;
-    u8 biosrev;
-    u8 feature1, feature2, feature3, feature4, feature5;
-} PACKED;
-
-#endif // bda.h
diff --git a/qemu/roms/seabios/src/std/disk.h b/qemu/roms/seabios/src/std/disk.h
deleted file mode 100644
index 639710899..000000000
--- a/qemu/roms/seabios/src/std/disk.h
+++ /dev/null
@@ -1,175 +0,0 @@
-// Standard disk BIOS definitions.
-#ifndef __DISK_H
-#define __DISK_H
-
-#include "types.h" // u8
-
-#define DISK_RET_SUCCESS       0x00
-#define DISK_RET_EPARAM        0x01
-#define DISK_RET_EADDRNOTFOUND 0x02
-#define DISK_RET_EWRITEPROTECT 0x03
-#define DISK_RET_ECHANGED      0x06
-#define DISK_RET_EBOUNDARY     0x09
-#define DISK_RET_EBADTRACK     0x0c
-#define DISK_RET_ECONTROLLER   0x20
-#define DISK_RET_ETIMEOUT      0x80
-#define DISK_RET_ENOTLOCKED    0xb0
-#define DISK_RET_ELOCKED       0xb1
-#define DISK_RET_ENOTREMOVABLE 0xb2
-#define DISK_RET_ETOOMANYLOCKS 0xb4
-#define DISK_RET_EMEDIA        0xC0
-#define DISK_RET_ENOTREADY     0xAA
-
-
-/****************************************************************
- * Interface structs
- ****************************************************************/
-
-// Bios disk structures.
-struct int13ext_s {
-    u8  size;
-    u8  reserved;
-    u16 count;
-    struct segoff_s data;
-    u64 lba;
-} PACKED;
-
-// DPTE definition
-struct dpte_s {
-    u16 iobase1;
-    u16 iobase2;
-    u8  prefix;
-    u8  unused;
-    u8  irq;
-    u8  blkcount;
-    u8  dma;
-    u8  pio;
-    u16 options;
-    u16 reserved;
-    u8  revision;
-    u8  checksum;
-};
-
-// Disk Physical Table definition
-struct int13dpt_s {
-    u16 size;
-    u16 infos;
-    u32 cylinders;
-    u32 heads;
-    u32 spt;
-    u64 sector_count;
-    u16 blksize;
-    struct segoff_s dpte;
-    u16 key;
-    u8  dpi_length;
-    u8  reserved1;
-    u16 reserved2;
-    u8  host_bus[4];
-    u8  iface_type[8];
-    u64 iface_path;
-    union {
-        struct {
-            u64 device_path;
-            u8  reserved3;
-            u8  checksum;
-        } phoenix;
-        struct {
-            u64 device_path[2];
-            u8  reserved3;
-            u8  checksum;
-        } t13;
-    };
-} PACKED;
-
-// Floppy info
-struct fdpt_s {
-    u16 cylinders;
-    u8 heads;
-    u8 a0h_signature;
-    u8 phys_sectors;
-    u16 precompensation;
-    u8 reserved;
-    u8 drive_control_byte;
-    u16 phys_cylinders;
-    u8 phys_heads;
-    u16 landing_zone;
-    u8 sectors;
-    u8 checksum;
-} PACKED;
-
-// Floppy "Disk Base Table"
-struct floppy_dbt_s {
-    u8 specify1;
-    u8 specify2;
-    u8 shutoff_ticks;
-    u8 bps_code;
-    u8 sectors;
-    u8 interblock_len;
-    u8 data_len;
-    u8 gap_len;
-    u8 fill_byte;
-    u8 settle_time;
-    u8 startup_time;
-} PACKED;
-
-struct floppy_ext_dbt_s {
-    struct floppy_dbt_s dbt;
-    // Extra fields
-    u8 max_track;
-    u8 data_rate;
-    u8 drive_type;
-} PACKED;
-
-
-/****************************************************************
- * Master boot record
- ****************************************************************/
-
-struct packed_chs_s {
-    u8 heads;
-    u8 sptcyl;
-    u8 cyllow;
-} PACKED;
-
-struct partition_s {
-    u8 status;
-    struct packed_chs_s first;
-    u8 type;
-    struct packed_chs_s last;
-    u32 lba;
-    u32 count;
-} PACKED;
-
-struct mbr_s {
-    u8 code[440];
-    // 0x01b8
-    u32 diskseg;
-    // 0x01bc
-    u16 null;
-    // 0x01be
-    struct partition_s partitions[4];
-    // 0x01fe
-    u16 signature;
-} PACKED;
-
-#define MBR_SIGNATURE 0xaa55
-
-
-/****************************************************************
- * ElTorito CDROM interface
- ****************************************************************/
-
-struct eltorito_s {
-    u8 size;
-    u8 media;
-    u8 emulated_drive;
-    u8 controller_index;
-    u32 ilba;
-    u16 device_spec;
-    u16 buffer_segment;
-    u16 load_segment;
-    u16 sector_count;
-    struct packed_chs_s chs;
-} PACKED;
-
-#endif // disk.h
diff --git a/qemu/roms/seabios/src/std/mptable.h b/qemu/roms/seabios/src/std/mptable.h
deleted file mode 100644
index fa6a22949..000000000
--- a/qemu/roms/seabios/src/std/mptable.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef __MPTABLE_H
-#define __MPTABLE_H
-
-#include "types.h" // u32
-
-#define MPTABLE_SIGNATURE 0x5f504d5f  // "_MP_"
-
-struct mptable_floating_s {
-    u32 signature;
-    u32 physaddr;
-    u8 length;
-    u8 spec_rev;
-    u8 checksum;
-    u8 feature1;
-    u8 feature2;
-    u8 reserved[3];
-};
-
-#define MPCONFIG_SIGNATURE 0x504d4350  // "PCMP"
-
-struct mptable_config_s {
-    u32 signature;
-    u16 length;
-    u8 spec;
-    u8 checksum;
-    char oemid[8];
-    char productid[12];
-    u32 oemptr;
-    u16 oemsize;
-    u16 entrycount;
-    u32 lapic;
-    u16 exttable_length;
-    u8 exttable_checksum;
-    u8 reserved;
-} PACKED;
-
-#define MPT_TYPE_CPU 0
-#define MPT_TYPE_BUS 1
-#define MPT_TYPE_IOAPIC 2
-#define MPT_TYPE_INTSRC 3
-#define MPT_TYPE_LOCAL_INT 4
-
-struct mpt_cpu {
-    u8 type;
-    u8 apicid;
-    u8 apicver;
-    u8 cpuflag;
-    u32 cpusignature;
-    u32 featureflag;
-    u32 reserved[2];
-} PACKED;
-
-struct mpt_bus {
-    u8 type;
-    u8 busid;
-    char bustype[6];
-} PACKED;
-
-struct mpt_ioapic {
-    u8 type;
-    u8 apicid;
-    u8 apicver;
-    u8 flags;
-    u32 apicaddr;
-} PACKED;
-
-struct mpt_intsrc {
-    u8 type;
-    u8 irqtype;
-    u16 irqflag;
-    u8 srcbus;
-    u8 srcbusirq;
-    u8 dstapic;
-    u8 dstirq;
-} PACKED;
-
-#endif // mptable.h
diff --git a/qemu/roms/seabios/src/std/multiboot.h b/qemu/roms/seabios/src/std/multiboot.h
deleted file mode 100644
index 6c9512703..000000000
--- a/qemu/roms/seabios/src/std/multiboot.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/*  multiboot.h - Multiboot header file.  */
-/*  Copyright (C) 1999,2003,2007,2008,2009,2010  Free Software Foundation, Inc.
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to
- *  deal in the Software without restriction, including without limitation the
- *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- *  sell copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL ANY
- *  DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
- *  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef MULTIBOOT_HEADER
-#define MULTIBOOT_HEADER 1
-
-/* How many bytes from the start of the file we search for the header.  */
-#define MULTIBOOT_SEARCH			8192
-#define MULTIBOOT_HEADER_ALIGN			4
-
-/* The magic field should contain this.  */
-#define MULTIBOOT_HEADER_MAGIC			0x1BADB002
-
-/* This should be in %eax.  */
-#define MULTIBOOT_BOOTLOADER_MAGIC		0x2BADB002
-
-/* Alignment of multiboot modules.  */
-#define MULTIBOOT_MOD_ALIGN			0x00001000
-
-/* Alignment of the multiboot info structure.  */
-#define MULTIBOOT_INFO_ALIGN			0x00000004
-
-/* Flags set in the 'flags' member of the multiboot header.  */
-
-/* Align all boot modules on i386 page (4KB) boundaries.  */
-#define MULTIBOOT_PAGE_ALIGN			0x00000001
-
-/* Must pass memory information to OS.  */
-#define MULTIBOOT_MEMORY_INFO			0x00000002
-
-/* Must pass video information to OS.  */
-#define MULTIBOOT_VIDEO_MODE			0x00000004
-
-/* This flag indicates the use of the address fields in the header.  */
-#define MULTIBOOT_AOUT_KLUDGE			0x00010000
-
-/* Flags to be set in the 'flags' member of the multiboot info structure.  */
-
-/* is there basic lower/upper memory information? */
-#define MULTIBOOT_INFO_MEMORY			0x00000001
-/* is there a boot device set? */
-#define MULTIBOOT_INFO_BOOTDEV			0x00000002
-/* is the command-line defined? */
-#define MULTIBOOT_INFO_CMDLINE			0x00000004
-/* are there modules to do something with? */
-#define MULTIBOOT_INFO_MODS			0x00000008
-
-/* These next two are mutually exclusive */
-
-/* is there a symbol table loaded? */
-#define MULTIBOOT_INFO_AOUT_SYMS		0x00000010
-/* is there an ELF section header table? */
-#define MULTIBOOT_INFO_ELF_SHDR			0X00000020
-
-/* is there a full memory map? */
-#define MULTIBOOT_INFO_MEM_MAP			0x00000040
-
-/* Is there drive info?  */
-#define MULTIBOOT_INFO_DRIVE_INFO		0x00000080
-
-/* Is there a config table?  */
-#define MULTIBOOT_INFO_CONFIG_TABLE		0x00000100
-
-/* Is there a boot loader name?  */
-#define MULTIBOOT_INFO_BOOT_LOADER_NAME		0x00000200
-
-/* Is there a APM table?  */
-#define MULTIBOOT_INFO_APM_TABLE		0x00000400
-
-/* Is there video information?  */
-#define MULTIBOOT_INFO_VBE_INFO		        0x00000800
-#define MULTIBOOT_INFO_FRAMEBUFFER_INFO	        0x00001000
-
-#ifndef ASM_FILE
-
-typedef unsigned char		multiboot_uint8_t;
-typedef unsigned short		multiboot_uint16_t;
-typedef unsigned int		multiboot_uint32_t;
-typedef unsigned long long	multiboot_uint64_t;
-
-struct multiboot_header
-{
-  /* Must be MULTIBOOT_MAGIC - see above.  */
-  multiboot_uint32_t magic;
-
-  /* Feature flags.  */
-  multiboot_uint32_t flags;
-
-  /* The above fields plus this one must equal 0 mod 2^32. */
-  multiboot_uint32_t checksum;
-
-  /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set.  */
-  multiboot_uint32_t header_addr;
-  multiboot_uint32_t load_addr;
-  multiboot_uint32_t load_end_addr;
-  multiboot_uint32_t bss_end_addr;
-  multiboot_uint32_t entry_addr;
-
-  /* These are only valid if MULTIBOOT_VIDEO_MODE is set.  */
-  multiboot_uint32_t mode_type;
-  multiboot_uint32_t width;
-  multiboot_uint32_t height;
-  multiboot_uint32_t depth;
-};
-
-/* The symbol table for a.out.  */
-struct multiboot_aout_symbol_table
-{
-  multiboot_uint32_t tabsize;
-  multiboot_uint32_t strsize;
-  multiboot_uint32_t addr;
-  multiboot_uint32_t reserved;
-};
-typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
-
-/* The section header table for ELF.  */
-struct multiboot_elf_section_header_table
-{
-  multiboot_uint32_t num;
-  multiboot_uint32_t size;
-  multiboot_uint32_t addr;
-  multiboot_uint32_t shndx;
-};
-typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t;
-
-struct multiboot_info
-{
-  /* Multiboot info version number */
-  multiboot_uint32_t flags;
-
-  /* Available memory from BIOS */
-  multiboot_uint32_t mem_lower;
-  multiboot_uint32_t mem_upper;
-
-  /* "root" partition */
-  multiboot_uint32_t boot_device;
-
-  /* Kernel command line */
-  multiboot_uint32_t cmdline;
-
-  /* Boot-Module list */
-  multiboot_uint32_t mods_count;
-  multiboot_uint32_t mods_addr;
-
-  union
-  {
-    multiboot_aout_symbol_table_t aout_sym;
-    multiboot_elf_section_header_table_t elf_sec;
-  } u;
-
-  /* Memory Mapping buffer */
-  multiboot_uint32_t mmap_length;
-  multiboot_uint32_t mmap_addr;
-
-  /* Drive Info buffer */
-  multiboot_uint32_t drives_length;
-  multiboot_uint32_t drives_addr;
-
-  /* ROM configuration table */
-  multiboot_uint32_t config_table;
-
-  /* Boot Loader Name */
-  multiboot_uint32_t boot_loader_name;
-
-  /* APM table */
-  multiboot_uint32_t apm_table;
-
-  /* Video */
-  multiboot_uint32_t vbe_control_info;
-  multiboot_uint32_t vbe_mode_info;
-  multiboot_uint16_t vbe_mode;
-  multiboot_uint16_t vbe_interface_seg;
-  multiboot_uint16_t vbe_interface_off;
-  multiboot_uint16_t vbe_interface_len;
-
-  multiboot_uint64_t framebuffer_addr;
-  multiboot_uint32_t framebuffer_pitch;
-  multiboot_uint32_t framebuffer_width;
-  multiboot_uint32_t framebuffer_height;
-  multiboot_uint8_t framebuffer_bpp;
-#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
-#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB     1
-#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT	2
-  multiboot_uint8_t framebuffer_type;
-  union
-  {
-    struct
-    {
-      multiboot_uint32_t framebuffer_palette_addr;
-      multiboot_uint16_t framebuffer_palette_num_colors;
-    };
-    struct
-    {
-      multiboot_uint8_t framebuffer_red_field_position;
-      multiboot_uint8_t framebuffer_red_mask_size;
-      multiboot_uint8_t framebuffer_green_field_position;
-      multiboot_uint8_t framebuffer_green_mask_size;
-      multiboot_uint8_t framebuffer_blue_field_position;
-      multiboot_uint8_t framebuffer_blue_mask_size;
-    };
-  };
-};
-typedef struct multiboot_info multiboot_info_t;
-
-struct multiboot_color
-{
-  multiboot_uint8_t red;
-  multiboot_uint8_t green;
-  multiboot_uint8_t blue;
-};
-
-struct multiboot_mmap_entry
-{
-  multiboot_uint32_t size;
-  multiboot_uint64_t addr;
-  multiboot_uint64_t len;
-#define MULTIBOOT_MEMORY_AVAILABLE		1
-#define MULTIBOOT_MEMORY_RESERVED		2
-#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
-#define MULTIBOOT_MEMORY_NVS                    4
-#define MULTIBOOT_MEMORY_BADRAM                 5
-  multiboot_uint32_t type;
-} __attribute__((packed));
-typedef struct multiboot_mmap_entry multiboot_memory_map_t;
-
-struct multiboot_mod_list
-{
-  /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */
-  multiboot_uint32_t mod_start;
-  multiboot_uint32_t mod_end;
-
-  /* Module command line */
-  multiboot_uint32_t cmdline;
-
-  /* padding to take it to 16 bytes (must be zero) */
-  multiboot_uint32_t pad;
-};
-typedef struct multiboot_mod_list multiboot_module_t;
-
-#endif /* ! ASM_FILE */
-
-#endif /* ! MULTIBOOT_HEADER */
diff --git a/qemu/roms/seabios/src/std/optionrom.h b/qemu/roms/seabios/src/std/optionrom.h
deleted file mode 100644
index 94ca4ae10..000000000
--- a/qemu/roms/seabios/src/std/optionrom.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __OPTIONROMS_H
-#define __OPTIONROMS_H
-
-#include "types.h" // u32
-
-#define OPTION_ROM_SIGNATURE 0xaa55
-
-struct rom_header {
-    u16 signature;
-    u8 size;
-    u8 initVector[4];
-    u8 reserved[17];
-    u16 pcioffset;
-    u16 pnpoffset;
-} PACKED;
-
-#define PCI_ROM_SIGNATURE 0x52494350 // "PCIR"
-
-struct pci_data {
-    u32 signature;
-    u16 vendor;
-    u16 device;
-    u16 vitaldata;
-    u16 dlen;
-    u8 drevision;
-    u8 class_lo;
-    u16 class_hi;
-    u16 ilen;
-    u16 irevision;
-    u8 type;
-    u8 indicator;
-    u16 reserved;
-} PACKED;
-
-struct pnp_data {
-    u32 signature;
-    u8 revision;
-    u8 len;
-    u16 nextoffset;
-    u8 reserved_08;
-    u8 checksum;
-    u32 devid;
-    u16 manufacturer;
-    u16 productname;
-    u8 type_lo;
-    u16 type_hi;
-    u8 dev_flags;
-    u16 bcv;
-    u16 dv;
-    u16 bev;
-    u16 reserved_1c;
-    u16 staticresource;
-} PACKED;
-
-#define OPTION_ROM_ALIGN 2048
-#define OPTION_ROM_INITVECTOR offsetof(struct rom_header, initVector[0])
-#define PCIROM_CODETYPE_X86 0
-
-#endif
diff --git a/qemu/roms/seabios/src/std/pirtable.h b/qemu/roms/seabios/src/std/pirtable.h
deleted file mode 100644
index 9de3a4389..000000000
--- a/qemu/roms/seabios/src/std/pirtable.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef __PIRTABLE_H
-#define __PIRTABLE_H
-
-#include "types.h" // u32
-
-struct link_info {
-    u8 link;
-    u16 bitmap;
-} PACKED;
-
-struct pir_slot {
-    u8 bus;
-    u8 dev;
-    struct link_info links[4];
-    u8 slot_nr;
-    u8 reserved;
-} PACKED;
-
-struct pir_header {
-    u32 signature;
-    u16 version;
-    u16 size;
-    u8 router_bus;
-    u8 router_devfunc;
-    u16 exclusive_irqs;
-    u32 compatible_devid;
-    u32 miniport_data;
-    u8 reserved[11];
-    u8 checksum;
-    struct pir_slot slots[0];
-} PACKED;
-
-#define PIR_SIGNATURE 0x52495024 // $PIR
-
-#endif // pirtable.h
diff --git a/qemu/roms/seabios/src/std/pmm.h b/qemu/roms/seabios/src/std/pmm.h
deleted file mode 100644
index 80027f38b..000000000
--- a/qemu/roms/seabios/src/std/pmm.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __PMM_H
-#define __PMM_H
-
-#include "types.h" // u32
-
-#define PMM_SIGNATURE 0x4d4d5024 // $PMM
-
-struct pmmheader {
-    u32 signature;
-    u8 version;
-    u8 length;
-    u8 checksum;
-    struct segoff_s entry;
-    u8 reserved[5];
-} PACKED;
-
-#define PMM_FUNCTION_NOT_SUPPORTED 0xffffffff
-
-#endif // pmm.h
diff --git a/qemu/roms/seabios/src/std/pnpbios.h b/qemu/roms/seabios/src/std/pnpbios.h
deleted file mode 100644
index 0871e3ab5..000000000
--- a/qemu/roms/seabios/src/std/pnpbios.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __PNPHEADER_H
-#define __PNPHEADER_H
-
-#define PNP_SIGNATURE 0x506e5024 // $PnP
-
-struct pnpheader {
-    u32 signature;
-    u8 version;
-    u8 length;
-    u16 control;
-    u8 checksum;
-    u32 eventloc;
-    u16 real_ip;
-    u16 real_cs;
-    u16 prot_ip;
-    u32 prot_base;
-    u32 oemid;
-    u16 real_ds;
-    u32 prot_database;
-} PACKED;
-
-#define FUNCTION_NOT_SUPPORTED 0x82
-
-#endif // pnpheader.h
diff --git a/qemu/roms/seabios/src/std/smbios.h b/qemu/roms/seabios/src/std/smbios.h
deleted file mode 100644
index 4ccf2ea34..000000000
--- a/qemu/roms/seabios/src/std/smbios.h
+++ /dev/null
@@ -1,167 +0,0 @@
-#ifndef __SMBIOS_H
-#define __SMBIOS_H
-
-#include "types.h" // u32
-
-#define SMBIOS_SIGNATURE 0x5f4d535f // "_SM_"
-
-/* SMBIOS entry point -- must be written to a 16-bit aligned address
-   between 0xf0000 and 0xfffff.
- */
-struct smbios_entry_point {
-    u32 signature;
-    u8 checksum;
-    u8 length;
-    u8 smbios_major_version;
-    u8 smbios_minor_version;
-    u16 max_structure_size;
-    u8 entry_point_revision;
-    u8 formatted_area[5];
-    char intermediate_anchor_string[5];
-    u8 intermediate_checksum;
-    u16 structure_table_length;
-    u32 structure_table_address;
-    u16 number_of_structures;
-    u8 smbios_bcd_revision;
-} PACKED;
-
-/* This goes at the beginning of every SMBIOS structure. */
-struct smbios_structure_header {
-    u8 type;
-    u8 length;
-    u16 handle;
-} PACKED;
-
-/* SMBIOS type 0 - BIOS Information */
-struct smbios_type_0 {
-    struct smbios_structure_header header;
-    u8 vendor_str;
-    u8 bios_version_str;
-    u16 bios_starting_address_segment;
-    u8 bios_release_date_str;
-    u8 bios_rom_size;
-    u8 bios_characteristics[8];
-    u8 bios_characteristics_extension_bytes[2];
-    u8 system_bios_major_release;
-    u8 system_bios_minor_release;
-    u8 embedded_controller_major_release;
-    u8 embedded_controller_minor_release;
-} PACKED;
-
-/* SMBIOS type 1 - System Information */
-struct smbios_type_1 {
-    struct smbios_structure_header header;
-    u8 manufacturer_str;
-    u8 product_name_str;
-    u8 version_str;
-    u8 serial_number_str;
-    u8 uuid[16];
-    u8 wake_up_type;
-    u8 sku_number_str;
-    u8 family_str;
-} PACKED;
-
-/* SMBIOS type 3 - System Enclosure (v2.3) */
-struct smbios_type_3 {
-    struct smbios_structure_header header;
-    u8 manufacturer_str;
-    u8 type;
-    u8 version_str;
-    u8 serial_number_str;
-    u8 asset_tag_number_str;
-    u8 boot_up_state;
-    u8 power_supply_state;
-    u8 thermal_state;
-    u8 security_status;
-    u32 oem_defined;
-    u8 height;
-    u8 number_of_power_cords;
-    u8 contained_element_count;
-    // contained elements follow
-} PACKED;
-
-/* SMBIOS type 4 - Processor Information (v2.0) */
-struct smbios_type_4 {
-    struct smbios_structure_header header;
-    u8 socket_designation_str;
-    u8 processor_type;
-    u8 processor_family;
-    u8 processor_manufacturer_str;
-    u32 processor_id[2];
-    u8 processor_version_str;
-    u8 voltage;
-    u16 external_clock;
-    u16 max_speed;
-    u16 current_speed;
-    u8 status;
-    u8 processor_upgrade;
-    u16 l1_cache_handle;
-    u16 l2_cache_handle;
-    u16 l3_cache_handle;
-} PACKED;
-
-/* SMBIOS type 16 - Physical Memory Array
- *   Associated with one type 17 (Memory Device).
- */
-struct smbios_type_16 {
-    struct smbios_structure_header header;
-    u8 location;
-    u8 use;
-    u8 error_correction;
-    u32 maximum_capacity;
-    u16 memory_error_information_handle;
-    u16 number_of_memory_devices;
-} PACKED;
-
-/* SMBIOS type 17 - Memory Device
- *   Associated with one type 19
- */
-struct smbios_type_17 {
-    struct smbios_structure_header header;
-    u16 physical_memory_array_handle;
-    u16 memory_error_information_handle;
-    u16 total_width;
-    u16 data_width;
-    u16 size;
-    u8 form_factor;
-    u8 device_set;
-    u8 device_locator_str;
-    u8 bank_locator_str;
-    u8 memory_type;
-    u16 type_detail;
-} PACKED;
-
-/* SMBIOS type 19 - Memory Array Mapped Address */
-struct smbios_type_19 {
-    struct smbios_structure_header header;
-    u32 starting_address;
-    u32 ending_address;
-    u16 memory_array_handle;
-    u8 partition_width;
-} PACKED;
-
-/* SMBIOS type 20 - Memory Device Mapped Address */
-struct smbios_type_20 {
-    struct smbios_structure_header header;
-    u32 starting_address;
-    u32 ending_address;
-    u16 memory_device_handle;
-    u16 memory_array_mapped_address_handle;
-    u8 partition_row_position;
-    u8 interleave_position;
-    u8 interleaved_data_depth;
-} PACKED;
-
-/* SMBIOS type 32 - System Boot Information */
-struct smbios_type_32 {
-    struct smbios_structure_header header;
-    u8 reserved[6];
-    u8 boot_status;
-} PACKED;
-
-/* SMBIOS type 127 -- End-of-table */
-struct smbios_type_127 {
-    struct smbios_structure_header header;
-} PACKED;
-
-#endif // smbios.h
diff --git a/qemu/roms/seabios/src/std/vbe.h b/qemu/roms/seabios/src/std/vbe.h
deleted file mode 100644
index 94b4ad86f..000000000
--- a/qemu/roms/seabios/src/std/vbe.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#ifndef __VBE_H
-#define __VBE_H
-
-#include "types.h" // u8
-
-#define VESA_SIGNATURE 0x41534556 // VESA
-#define VBE2_SIGNATURE 0x32454256 // VBE2
-
-struct vbe_info {
-    u32 signature;
-    u16 version;
-    struct segoff_s oem_string;
-    u32 capabilities;
-    struct segoff_s video_mode;
-    u16 total_memory;
-    u16 oem_revision;
-    struct segoff_s oem_vendor_string;
-    struct segoff_s oem_product_string;
-    struct segoff_s oem_revision_string;
-    u8 reserved[222];
-} PACKED;
-
-struct vbe_mode_info {
-    /* VBE */
-    u16 mode_attributes;
-    u8 winA_attributes;
-    u8 winB_attributes;
-    u16 win_granularity;
-    u16 win_size;
-    u16 winA_seg;
-    u16 winB_seg;
-    struct segoff_s win_func_ptr;
-    u16 bytes_per_scanline;
-    /* VBE 1.2 */
-    u16 xres;
-    u16 yres;
-    u8 xcharsize;
-    u8 ycharsize;
-    u8 planes;
-    u8 bits_per_pixel;
-    u8 banks;
-    u8 mem_model;
-    u8 bank_size;
-    u8 pages;
-    u8 reserved0;
-    /* Direct Color */
-    u8 red_size;
-    u8 red_pos;
-    u8 green_size;
-    u8 green_pos;
-    u8 blue_size;
-    u8 blue_pos;
-    u8 alpha_size;
-    u8 alpha_pos;
-    u8 directcolor_info;
-    /* VBE 2.0 */
-    u32 phys_base;
-    u32 reserved1;
-    u16 reserved2;
-    /* VBE 3.0 */
-    u16 linear_bytes_per_scanline;
-    u8 bank_pages;
-    u8 linear_pages;
-    u8 linear_red_size;
-    u8 linear_red_pos;
-    u8 linear_green_size;
-    u8 linear_green_pos;
-    u8 linear_blue_size;
-    u8 linear_blue_pos;
-    u8 linear_alpha_size;
-    u8 linear_alpha_pos;
-    u32 pixclock_max;
-    u8 reserved[190];
-} PACKED;
-
-struct vbe_crtc_info {
-    u16 horiz_total;
-    u16 horiz_sync_start;
-    u16 horiz_sync_end;
-    u16 vert_total;
-    u16 vert_sync_start;
-    u16 vert_sync_end;
-    u8 flags;
-    u32 pixclock;
-    u16 refresh_rate;
-    u8 reserved[40];
-} PACKED;
-
-/* VBE Return Status Info */
-/* AL */
-#define VBE_RETURN_STATUS_SUPPORTED                      0x4F
-#define VBE_RETURN_STATUS_UNSUPPORTED                    0x00
-/* AH */
-#define VBE_RETURN_STATUS_SUCCESSFULL                    0x00
-#define VBE_RETURN_STATUS_FAILED                         0x01
-#define VBE_RETURN_STATUS_NOT_SUPPORTED                  0x02
-#define VBE_RETURN_STATUS_INVALID                        0x03
-
-/* VBE Mode Numbers */
-
-#define VBE_MODE_VESA_DEFINED                            0x0100
-#define VBE_MODE_REFRESH_RATE_USE_CRTC                   0x0800
-#define VBE_MODE_LINEAR_FRAME_BUFFER                     0x4000
-#define VBE_MODE_PRESERVE_DISPLAY_MEMORY                 0x8000
-
-#define VBE_VESA_MODE_END_OF_LIST                        0xFFFF
-
-/* Capabilities */
-
-#define VBE_CAPABILITY_8BIT_DAC                          0x0001
-#define VBE_CAPABILITY_NOT_VGA_COMPATIBLE                0x0002
-#define VBE_CAPABILITY_RAMDAC_USE_BLANK_BIT              0x0004
-#define VBE_CAPABILITY_STEREOSCOPIC_SUPPORT              0x0008
-#define VBE_CAPABILITY_STEREO_VIA_VESA_EVC               0x0010
-
-/* Mode Attributes */
-
-#define VBE_MODE_ATTRIBUTE_SUPPORTED                     0x0001
-#define VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE  0x0002
-#define VBE_MODE_ATTRIBUTE_TTY_BIOS_SUPPORT              0x0004
-#define VBE_MODE_ATTRIBUTE_COLOR_MODE                    0x0008
-#define VBE_MODE_ATTRIBUTE_GRAPHICS_MODE                 0x0010
-#define VBE_MODE_ATTRIBUTE_NOT_VGA_COMPATIBLE            0x0020
-#define VBE_MODE_ATTRIBUTE_NO_VGA_COMPATIBLE_WINDOW      0x0040
-#define VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE      0x0080
-#define VBE_MODE_ATTRIBUTE_DOUBLE_SCAN_MODE              0x0100
-#define VBE_MODE_ATTRIBUTE_INTERLACE_MODE                0x0200
-#define VBE_MODE_ATTRIBUTE_HARDWARE_TRIPLE_BUFFER        0x0400
-#define VBE_MODE_ATTRIBUTE_HARDWARE_STEREOSCOPIC_DISPLAY 0x0800
-#define VBE_MODE_ATTRIBUTE_DUAL_DISPLAY_START_ADDRESS    0x1000
-
-#define VBE_MODE_ATTTRIBUTE_LFB_ONLY                     ( VBE_MODE_ATTRIBUTE_NO_VGA_COMPATIBLE_WINDOW | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE )
-
-/* Window attributes */
-
-#define VBE_WINDOW_ATTRIBUTE_RELOCATABLE                 0x01
-#define VBE_WINDOW_ATTRIBUTE_READABLE                    0x02
-#define VBE_WINDOW_ATTRIBUTE_WRITEABLE                   0x04
-
-/* Memory model */
-
-#define VBE_MEMORYMODEL_TEXT_MODE                        0x00
-#define VBE_MEMORYMODEL_CGA_GRAPHICS                     0x01
-#define VBE_MEMORYMODEL_HERCULES_GRAPHICS                0x02
-#define VBE_MEMORYMODEL_PLANAR                           0x03
-#define VBE_MEMORYMODEL_PACKED_PIXEL                     0x04
-#define VBE_MEMORYMODEL_NON_CHAIN_4_256                  0x05
-#define VBE_MEMORYMODEL_DIRECT_COLOR                     0x06
-#define VBE_MEMORYMODEL_YUV                              0x07
-
-/* DirectColorModeInfo */
-
-#define VBE_DIRECTCOLOR_COLOR_RAMP_PROGRAMMABLE          0x01
-#define VBE_DIRECTCOLOR_RESERVED_BITS_AVAILABLE          0x02
-
-#endif
diff --git a/qemu/roms/seabios/src/std/vga.h b/qemu/roms/seabios/src/std/vga.h
deleted file mode 100644
index de9ec7506..000000000
--- a/qemu/roms/seabios/src/std/vga.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef __VGA_H
-#define __VGA_H
-// Standard structure definitions for vgabios video tables
-
-#include "types.h" // u8
-
-// standard BIOS Video Parameter Table
-struct video_param_s {
-    u8 twidth;
-    u8 theightm1;
-    u8 cheight;
-    u16 slength;
-    u8 sequ_regs[4];
-    u8 miscreg;
-    u8 crtc_regs[25];
-    u8 actl_regs[20];
-    u8 grdc_regs[9];
-} PACKED;
-
-// Standard Video Save Pointer Table
-struct video_save_pointer_s {
-    struct segoff_s videoparam;
-    struct segoff_s paramdynamicsave;
-    struct segoff_s textcharset;
-    struct segoff_s graphcharset;
-    struct segoff_s secsavepointer;
-    u8 reserved[8];
-} PACKED;
-
-// Data returned by int101B
-struct video_func_static {
-    u32 modes;
-    u8 reserved_0x04[3];
-    u8 scanlines;
-    u8 cblocks;
-    u8 active_cblocks;
-    u16 misc_flags;
-    u8 reserved_0x0c[2];
-    u8 save_flags;
-    u8 reserved_0x0f;
-} PACKED;
-
-struct video_func_info {
-    struct segoff_s static_functionality;
-    u8 bda_0x49[30];
-    u8 bda_0x84[3];
-    u8 dcc_index;
-    u8 dcc_alt;
-    u16 colors;
-    u8 pages;
-    u8 scan_lines;
-    u8 primary_char;
-    u8 secondar_char;
-    u8 misc;
-    u8 non_vga_mode;
-    u8 reserved_2f[2];
-    u8 video_mem;
-    u8 save_flags;
-    u8 disp_info;
-    u8 reserved_34[12];
-} PACKED;
-
-#endif // vga.h