OvmfPkg/AcpiTables: remove unused module

The "OvmfPkg/AcpiTables/AcpiTables.inf" module is no longer used by any
module in edk2; remove it.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20210526201446.12554-19-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

diff --git a/OvmfPkg/AcpiTables/AcpiTables.inf b/OvmfPkg/AcpiTables/AcpiTables.inf
deleted file mode 100644 (file)
index b7d8d77..0000000
--- a/OvmfPkg/AcpiTables/AcpiTables.inf
+++ /dev/null
@@ -1,38 +0,0 @@
-## @file\r
-#  Component description file for PlatformAcpiTables module.\r
-#\r
-#  ACPI table data and ASL sources required to boot the platform.\r
-#\r
-#  Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
-#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-#\r
-##\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = PlatformAcpiTables\r
-  FILE_GUID                      = 7E374E25-8E01-4FEE-87F2-390C23C606CD\r
-  MODULE_TYPE                    = USER_DEFINED\r
-  VERSION_STRING                 = 1.0\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 EBC\r
-#\r
-\r
-[Sources]\r
-  Platform.h\r
-  Madt.aslc\r
-  Facp.aslc\r
-  Facs.aslc\r
-  Dsdt.asl\r
-  Ssdt.asl\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  OvmfPkg/OvmfPkg.dec\r
-\r
-[Pcd]\r
-  gUefiOvmfPkgTokenSpaceGuid.PcdDebugIoPort\r
-\r

diff --git a/OvmfPkg/AcpiTables/Dsdt.asl b/OvmfPkg/AcpiTables/Dsdt.asl
deleted file mode 100644 (file)
index 7550fb4..0000000
--- a/OvmfPkg/AcpiTables/Dsdt.asl
+++ /dev/null
@@ -1,692 +0,0 @@
-/** @file\r
-  Contains root level name space objects for the platform\r
-\r
-  Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>\r
-  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-DefinitionBlock ("Dsdt.aml", "DSDT", 1, "INTEL ", "OVMF    ", 4) {\r
-  //\r
-  // System Sleep States\r
-  //\r
-  // We build S3 and S4 with GetSuspendStates() in\r
-  // "OvmfPkg/AcpiPlatformDxe/Qemu.c".\r
-  //\r
-  Name (\_S0, Package () {5, 0, 0, 0}) // Working\r
-  Name (\_S5, Package () {0, 0, 0, 0}) // Soft Off\r
-\r
-  //\r
-  //  System Bus\r
-  //\r
-  Scope (\_SB) {\r
-    //\r
-    // PCI Root Bridge\r
-    //\r
-    Device (PCI0) {\r
-      Name (_HID, EISAID ("PNP0A03"))\r
-      Name (_ADR, 0x00000000)\r
-      Name (_BBN, 0x00)\r
-      Name (_UID, 0x00)\r
-\r
-      //\r
-      // BUS, I/O, and MMIO resources\r
-      //\r
-      Name (CRES, ResourceTemplate () {\r
-        WORDBusNumber (          // Bus number resource (0); the bridge produces bus numbers for its subsequent buses\r
-          ResourceProducer,      // bit 0 of general flags is 1\r
-          MinFixed,              // Range is fixed\r
-          MaxFixed,              // Range is fixed\r
-          PosDecode,             // PosDecode\r
-          0x0000,                // Granularity\r
-          0x0000,                // Min\r
-          0x00FF,                // Max\r
-          0x0000,                // Translation\r
-          0x0100                 // Range Length = Max-Min+1\r
-          )\r
-\r
-        IO (Decode16, 0xCF8, 0xCF8, 0x01, 0x08)       //Consumed resource (0xCF8-0xCFF)\r
-\r
-        WORDIO (                 // Consumed-and-produced resource (all I/O below CF8)\r
-          ResourceProducer,      // bit 0 of general flags is 0\r
-          MinFixed,              // Range is fixed\r
-          MaxFixed,              // Range is fixed\r
-          PosDecode,\r
-          EntireRange,\r
-          0x0000,                // Granularity\r
-          0x0000,                // Min\r
-          0x0CF7,                // Max\r
-          0x0000,                // Translation\r
-          0x0CF8                 // Range Length\r
-          )\r
-\r
-        WORDIO (                 // Consumed-and-produced resource (all I/O above CFF)\r
-          ResourceProducer,      // bit 0 of general flags is 0\r
-          MinFixed,              // Range is fixed\r
-          MaxFixed,              // Range is fixed\r
-          PosDecode,\r
-          EntireRange,\r
-          0x0000,                // Granularity\r
-          0x0D00,                // Min\r
-          0xFFFF,                // Max\r
-          0x0000,                // Translation\r
-          0xF300                 // Range Length\r
-          )\r
-\r
-        DWORDMEMORY (            // Descriptor for legacy VGA video RAM\r
-          ResourceProducer,      // bit 0 of general flags is 0\r
-          PosDecode,\r
-          MinFixed,              // Range is fixed\r
-          MaxFixed,              // Range is Fixed\r
-          Cacheable,\r
-          ReadWrite,\r
-          0x00000000,            // Granularity\r
-          0x000A0000,            // Min\r
-          0x000BFFFF,            // Max\r
-          0x00000000,            // Translation\r
-          0x00020000             // Range Length\r
-          )\r
-\r
-        DWORDMEMORY (            // Descriptor for 32-bit MMIO\r
-          ResourceProducer,      // bit 0 of general flags is 0\r
-          PosDecode,\r
-          MinFixed,              // Range is fixed\r
-          MaxFixed,              // Range is Fixed\r
-          NonCacheable,\r
-          ReadWrite,\r
-          0x00000000,            // Granularity\r
-          0xF8000000,            // Min\r
-          0xFFFBFFFF,            // Max\r
-          0x00000000,            // Translation\r
-          0x07FC0000,            // Range Length\r
-          ,                      // ResourceSourceIndex\r
-          ,                      // ResourceSource\r
-          PW32                   // DescriptorName\r
-          )\r
-      })\r
-\r
-      Name (CR64, ResourceTemplate () {\r
-        QWordMemory (            // Descriptor for 64-bit MMIO\r
-            ResourceProducer,    // bit 0 of general flags is 0\r
-            PosDecode,\r
-            MinFixed,            // Range is fixed\r
-            MaxFixed,            // Range is Fixed\r
-            Cacheable,\r
-            ReadWrite,\r
-            0x00000000,          // Granularity\r
-            0x8000000000,        // Min\r
-            0xFFFFFFFFFF,        // Max\r
-            0x00000000,          // Translation\r
-            0x8000000000,        // Range Length\r
-            ,                    // ResourceSourceIndex\r
-            ,                    // ResourceSource\r
-            PW64                 // DescriptorName\r
-            )\r
-      })\r
-\r
-      Method (_CRS, 0, Serialized) {\r
-        //\r
-        // see the FIRMWARE_DATA structure in "OvmfPkg/AcpiPlatformDxe/Qemu.c"\r
-        //\r
-        External (FWDT, OpRegionObj)\r
-        Field(FWDT, QWordAcc, NoLock, Preserve) {\r
-          P0S, 64,               // PciWindow32.Base\r
-          P0E, 64,               // PciWindow32.End\r
-          P0L, 64,               // PciWindow32.Length\r
-          P1S, 64,               // PciWindow64.Base\r
-          P1E, 64,               // PciWindow64.End\r
-          P1L, 64                // PciWindow64.Length\r
-        }\r
-        Field(FWDT, DWordAcc, NoLock, Preserve) {\r
-          P0SL, 32,              // PciWindow32.Base,   low  32 bits\r
-          P0SH, 32,              // PciWindow32.Base,   high 32 bits\r
-          P0EL, 32,              // PciWindow32.End,    low  32 bits\r
-          P0EH, 32,              // PciWindow32.End,    high 32 bits\r
-          P0LL, 32,              // PciWindow32.Length, low  32 bits\r
-          P0LH, 32,              // PciWindow32.Length, high 32 bits\r
-          P1SL, 32,              // PciWindow64.Base,   low  32 bits\r
-          P1SH, 32,              // PciWindow64.Base,   high 32 bits\r
-          P1EL, 32,              // PciWindow64.End,    low  32 bits\r
-          P1EH, 32,              // PciWindow64.End,    high 32 bits\r
-          P1LL, 32,              // PciWindow64.Length, low  32 bits\r
-          P1LH, 32               // PciWindow64.Length, high 32 bits\r
-        }\r
-\r
-        //\r
-        // fixup 32-bit PCI IO window\r
-        //\r
-        CreateDWordField (CRES, \_SB.PCI0.PW32._MIN, PS32)\r
-        CreateDWordField (CRES, \_SB.PCI0.PW32._MAX, PE32)\r
-        CreateDWordField (CRES, \_SB.PCI0.PW32._LEN, PL32)\r
-        Store (P0SL, PS32)\r
-        Store (P0EL, PE32)\r
-        Store (P0LL, PL32)\r
-\r
-        If (LAnd (LEqual (P1SL, 0x00), LEqual (P1SH, 0x00))) {\r
-          Return (CRES)\r
-        } Else {\r
-          //\r
-          // fixup 64-bit PCI IO window\r
-          //\r
-          CreateQWordField (CR64, \_SB.PCI0.PW64._MIN, PS64)\r
-          CreateQWordField (CR64, \_SB.PCI0.PW64._MAX, PE64)\r
-          CreateQWordField (CR64, \_SB.PCI0.PW64._LEN, PL64)\r
-          Store (P1S, PS64)\r
-          Store (P1E, PE64)\r
-          Store (P1L, PL64)\r
-\r
-          //\r
-          // add window and return result\r
-          //\r
-          ConcatenateResTemplate (CRES, CR64, Local0)\r
-          Return (Local0)\r
-        }\r
-      }\r
-\r
-      //\r
-      // PCI Interrupt Routing Table - PIC Mode Only\r
-      //\r
-      Method (_PRT, 0, NotSerialized) {\r
-        Return (\r
-          Package () {\r
-            //\r
-            // Bus 0; Devices 0 to 15\r
-            //\r
-            Package () {0x0000FFFF, 0x00, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x0000FFFF, 0x01, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x0000FFFF, 0x02, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x0000FFFF, 0x03, \_SB.PCI0.LPC.LNKC, 0x00},\r
-\r
-            //\r
-            // Bus 0, Device 1, Pin 0 (INTA) is special; it corresponds to the\r
-            // internally generated SCI (System Control Interrupt), which is\r
-            // always routed to GSI 9. By setting the third (= Source) field to\r
-            // zero, we could use the fourth (= Source Index) field to hardwire\r
-            // the pin to GSI 9 directly.\r
-            //\r
-            // That way however, in accordance with the ACPI spec's description\r
-            // of SCI, the interrupt would be treated as "active low,\r
-            // shareable, level", and that doesn't match qemu.\r
-            //\r
-            // In QemuInstallAcpiMadtTable() [OvmfPkg/AcpiPlatformDxe/Qemu.c]\r
-            // we install an Interrupt Override Structure for the identity\r
-            // mapped IRQ#9 / GSI 9 (the corresponding bit being set in\r
-            // Pcd8259LegacyModeEdgeLevel), which describes the correct\r
-            // polarity (active high). As a consequence, some OS'en (eg. Linux)\r
-            // override the default (active low) polarity originating from the\r
-            // _PRT; others (eg. FreeBSD) don't. Therefore we need a separate\r
-            // link device just to specify a polarity that matches the MADT.\r
-            //\r
-            Package () {0x0001FFFF, 0x00, \_SB.PCI0.LPC.LNKS, 0x00},\r
-\r
-            Package () {0x0001FFFF, 0x01, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x0001FFFF, 0x02, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x0001FFFF, 0x03, \_SB.PCI0.LPC.LNKD, 0x00},\r
-\r
-            Package () {0x0002FFFF, 0x00, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x0002FFFF, 0x01, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x0002FFFF, 0x02, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x0002FFFF, 0x03, \_SB.PCI0.LPC.LNKA, 0x00},\r
-\r
-            Package () {0x0003FFFF, 0x00, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x0003FFFF, 0x01, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x0003FFFF, 0x02, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x0003FFFF, 0x03, \_SB.PCI0.LPC.LNKB, 0x00},\r
-\r
-            Package () {0x0004FFFF, 0x00, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x0004FFFF, 0x01, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x0004FFFF, 0x02, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x0004FFFF, 0x03, \_SB.PCI0.LPC.LNKC, 0x00},\r
-\r
-            Package () {0x0005FFFF, 0x00, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x0005FFFF, 0x01, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x0005FFFF, 0x02, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x0005FFFF, 0x03, \_SB.PCI0.LPC.LNKD, 0x00},\r
-\r
-            Package () {0x0006FFFF, 0x00, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x0006FFFF, 0x01, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x0006FFFF, 0x02, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x0006FFFF, 0x03, \_SB.PCI0.LPC.LNKA, 0x00},\r
-\r
-            Package () {0x0007FFFF, 0x00, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x0007FFFF, 0x01, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x0007FFFF, 0x02, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x0007FFFF, 0x03, \_SB.PCI0.LPC.LNKB, 0x00},\r
-\r
-            Package () {0x0008FFFF, 0x00, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x0008FFFF, 0x01, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x0008FFFF, 0x02, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x0008FFFF, 0x03, \_SB.PCI0.LPC.LNKC, 0x00},\r
-\r
-            Package () {0x0009FFFF, 0x00, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x0009FFFF, 0x01, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x0009FFFF, 0x02, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x0009FFFF, 0x03, \_SB.PCI0.LPC.LNKD, 0x00},\r
-\r
-            Package () {0x000AFFFF, 0x00, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x000AFFFF, 0x01, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x000AFFFF, 0x02, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x000AFFFF, 0x03, \_SB.PCI0.LPC.LNKA, 0x00},\r
-\r
-            Package () {0x000BFFFF, 0x00, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x000BFFFF, 0x01, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x000BFFFF, 0x02, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x000BFFFF, 0x03, \_SB.PCI0.LPC.LNKB, 0x00},\r
-\r
-            Package () {0x000CFFFF, 0x00, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x000CFFFF, 0x01, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x000CFFFF, 0x02, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x000CFFFF, 0x03, \_SB.PCI0.LPC.LNKC, 0x00},\r
-\r
-            Package () {0x000DFFFF, 0x00, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x000DFFFF, 0x01, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x000DFFFF, 0x02, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x000DFFFF, 0x03, \_SB.PCI0.LPC.LNKD, 0x00},\r
-\r
-            Package () {0x000EFFFF, 0x00, \_SB.PCI0.LPC.LNKB, 0x00},\r
-            Package () {0x000EFFFF, 0x01, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x000EFFFF, 0x02, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x000EFFFF, 0x03, \_SB.PCI0.LPC.LNKA, 0x00},\r
-\r
-            Package () {0x000FFFFF, 0x00, \_SB.PCI0.LPC.LNKC, 0x00},\r
-            Package () {0x000FFFFF, 0x01, \_SB.PCI0.LPC.LNKD, 0x00},\r
-            Package () {0x000FFFFF, 0x02, \_SB.PCI0.LPC.LNKA, 0x00},\r
-            Package () {0x000FFFFF, 0x03, \_SB.PCI0.LPC.LNKB, 0x00}\r
-          }\r
-        )\r
-      }\r
-\r
-      //\r
-      // PCI to ISA Bridge (Bus 0, Device 1, Function 0)\r
-      // "Low Pin Count"\r
-      //\r
-      Device (LPC) {\r
-        Name (_ADR, 0x00010000)\r
-\r
-        //\r
-        // The SCI cannot be rerouted or disabled with PIRQRC[A:D]; we only\r
-        // need this link device in order to specify the polarity.\r
-        //\r
-        Device (LNKS) {\r
-          Name (_HID, EISAID("PNP0C0F"))\r
-          Name (_UID, 0)\r
-\r
-          Name (_STA, 0xB) // 0x1: device present\r
-                           // 0x2: enabled and decoding resources\r
-                           // 0x8: functioning properly\r
-\r
-          Method (_SRS, 1, NotSerialized) { /* no-op */ }\r
-          Method (_DIS, 0, NotSerialized) { /* no-op */ }\r
-\r
-          Name (_PRS, ResourceTemplate () {\r
-            Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { 9 }\r
-            //\r
-            // list of IRQs occupied thus far: 9\r
-            //\r
-          })\r
-          Method (_CRS, 0, NotSerialized) { Return (_PRS) }\r
-        }\r
-\r
-        //\r
-        // PCI Interrupt Routing Configuration Registers, PIRQRC[A:D]\r
-        //\r
-        OperationRegion (PRR0, PCI_Config, 0x60, 0x04)\r
-        Field (PRR0, ANYACC, NOLOCK, PRESERVE) {\r
-          PIRA, 8,\r
-          PIRB, 8,\r
-          PIRC, 8,\r
-          PIRD, 8\r
-        }\r
-\r
-        //\r
-        // _STA method for LNKA, LNKB, LNKC, LNKD\r
-        // Arg0[in]: value of PIRA / PIRB / PIRC / PIRD\r
-        //\r
-        Method (PSTA, 1, NotSerialized) {\r
-          If (And (Arg0, 0x80)) { // disable-bit set?\r
-            Return (0x9)          // "device present" | "functioning properly"\r
-          } Else {\r
-            Return (0xB)          // same | "enabled and decoding resources"\r
-          }\r
-        }\r
-\r
-        //\r
-        // _CRS method for LNKA, LNKB, LNKC, LNKD\r
-        // Arg0[in]: value of PIRA / PIRB / PIRC / PIRD\r
-        //\r
-        Method (PCRS, 1, Serialized) {\r
-          //\r
-          // create temporary buffer with an Extended Interrupt Descriptor\r
-          // whose single vector defaults to zero\r
-          //\r
-          Name (BUF0, ResourceTemplate () {\r
-              Interrupt (ResourceConsumer, Level, ActiveHigh, Shared){0}\r
-            }\r
-          )\r
-\r
-          //\r
-          // define reference to first interrupt vector in buffer\r
-          //\r
-          CreateDWordField (BUF0, 0x05, IRQW)\r
-\r
-          //\r
-          // If the disable-bit is clear, overwrite the default zero vector\r
-          // with the value in Arg0 (ie. PIRQRC[A:D]). Reserved bits are read\r
-          // as 0.\r
-          //\r
-          If (LNot (And (Arg0, 0x80))) {\r
-            Store (Arg0, IRQW)\r
-          }\r
-          Return (BUF0)\r
-        }\r
-\r
-        //\r
-        // _PRS resource for LNKA, LNKB, LNKC, LNKD\r
-        //\r
-        Name (PPRS, ResourceTemplate () {\r
-          Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) {5, 10, 11}\r
-          //\r
-          // list of IRQs occupied thus far: 9, 5, 10, 11\r
-          //\r
-        })\r
-\r
-        //\r
-        // PCI IRQ Link A\r
-        //\r
-        Device (LNKA) {\r
-          Name (_HID, EISAID("PNP0C0F"))\r
-          Name (_UID, 1)\r
-\r
-          Method (_STA, 0, NotSerialized) { Return (PSTA (PIRA)) }\r
-          Method (_DIS, 0, NotSerialized) {\r
-            Or (PIRA, 0x80, PIRA) // set disable-bit\r
-          }\r
-          Method (_CRS, 0, NotSerialized) { Return (PCRS (PIRA)) }\r
-          Method (_PRS, 0, NotSerialized) { Return (PPRS) }\r
-          Method (_SRS, 1, NotSerialized) {\r
-            CreateDWordField (Arg0, 0x05, IRQW)\r
-            Store (IRQW, PIRA)\r
-          }\r
-        }\r
-\r
-        //\r
-        // PCI IRQ Link B\r
-        //\r
-        Device (LNKB) {\r
-          Name (_HID, EISAID("PNP0C0F"))\r
-          Name (_UID, 2)\r
-\r
-          Method (_STA, 0, NotSerialized) { Return (PSTA (PIRB)) }\r
-          Method (_DIS, 0, NotSerialized) {\r
-            Or (PIRB, 0x80, PIRB) // set disable-bit\r
-          }\r
-          Method (_CRS, 0, NotSerialized) { Return (PCRS (PIRB)) }\r
-          Method (_PRS, 0, NotSerialized) { Return (PPRS) }\r
-          Method (_SRS, 1, NotSerialized) {\r
-            CreateDWordField (Arg0, 0x05, IRQW)\r
-            Store (IRQW, PIRB)\r
-          }\r
-        }\r
-\r
-        //\r
-        // PCI IRQ Link C\r
-        //\r
-        Device (LNKC) {\r
-          Name (_HID, EISAID("PNP0C0F"))\r
-          Name (_UID, 3)\r
-\r
-          Method (_STA, 0, NotSerialized) { Return (PSTA (PIRC)) }\r
-          Method (_DIS, 0, NotSerialized) {\r
-            Or (PIRC, 0x80, PIRC) // set disable-bit\r
-          }\r
-          Method (_CRS, 0, NotSerialized) { Return (PCRS (PIRC)) }\r
-          Method (_PRS, 0, NotSerialized) { Return (PPRS) }\r
-          Method (_SRS, 1, NotSerialized) {\r
-            CreateDWordField (Arg0, 0x05, IRQW)\r
-            Store (IRQW, PIRC)\r
-          }\r
-        }\r
-\r
-        //\r
-        // PCI IRQ Link D\r
-        //\r
-        Device (LNKD) {\r
-          Name (_HID, EISAID("PNP0C0F"))\r
-          Name (_UID, 4)\r
-\r
-          Method (_STA, 0, NotSerialized) { Return (PSTA (PIRD)) }\r
-          Method (_DIS, 0, NotSerialized) {\r
-            Or (PIRD, 0x80, PIRD) // set disable-bit\r
-          }\r
-          Method (_CRS, 0, NotSerialized) { Return (PCRS (PIRD)) }\r
-          Method (_PRS, 0, NotSerialized) { Return (PPRS) }\r
-          Method (_SRS, 1, NotSerialized) {\r
-            CreateDWordField (Arg0, 0x05, IRQW)\r
-            Store (IRQW, PIRD)\r
-          }\r
-        }\r
-\r
-        //\r
-        // Programmable Interrupt Controller (PIC)\r
-        //\r
-        Device(PIC) {\r
-          Name (_HID, EISAID ("PNP0000"))\r
-          Name (_CRS, ResourceTemplate () {\r
-            IO (Decode16, 0x020, 0x020, 0x00, 0x02)\r
-            IO (Decode16, 0x0A0, 0x0A0, 0x00, 0x02)\r
-            IO (Decode16, 0x4D0, 0x4D0, 0x00, 0x02)\r
-            IRQNoFlags () {2}\r
-            //\r
-            // list of IRQs occupied thus far: 9, 5, 10, 11, 2\r
-            //\r
-          })\r
-        }\r
-\r
-        //\r
-        // ISA DMA\r
-        //\r
-        Device (DMAC) {\r
-          Name (_HID, EISAID ("PNP0200"))\r
-          Name (_CRS, ResourceTemplate () {\r
-            IO (Decode16, 0x00, 0x00, 0, 0x10)\r
-            IO (Decode16, 0x81, 0x81, 0, 0x03)\r
-            IO (Decode16, 0x87, 0x87, 0, 0x01)\r
-            IO (Decode16, 0x89, 0x89, 0, 0x03)\r
-            IO (Decode16, 0x8f, 0x8f, 0, 0x01)\r
-            IO (Decode16, 0xc0, 0xc0, 0, 0x20)\r
-            DMA (Compatibility, NotBusMaster, Transfer8) {4}\r
-          })\r
-        }\r
-\r
-        //\r
-        // 8254 Timer\r
-        //\r
-        Device(TMR) {\r
-          Name(_HID,EISAID("PNP0100"))\r
-          Name(_CRS, ResourceTemplate () {\r
-            IO (Decode16, 0x40, 0x40, 0x00, 0x04)\r
-            IRQNoFlags () {0}\r
-            //\r
-            // list of IRQs occupied thus far: 9, 5, 10, 11, 2, 0\r
-            //\r
-          })\r
-        }\r
-\r
-        //\r
-        // Real Time Clock\r
-        //\r
-        Device (RTC) {\r
-          Name (_HID, EISAID ("PNP0B00"))\r
-          Name (_CRS, ResourceTemplate () {\r
-            IO (Decode16, 0x70, 0x70, 0x00, 0x02)\r
-            IRQNoFlags () {8}\r
-            //\r
-            // list of IRQs occupied thus far: 9, 5, 10, 11, 2, 0, 8\r
-            //\r
-          })\r
-        }\r
-\r
-        //\r
-        // PCAT Speaker\r
-        //\r
-        Device(SPKR) {\r
-          Name (_HID, EISAID("PNP0800"))\r
-          Name (_CRS, ResourceTemplate () {\r
-            IO (Decode16, 0x61, 0x61, 0x01, 0x01)\r
-          })\r
-        }\r
-\r
-        //\r
-        // Floating Point Coprocessor\r
-        //\r
-        Device(FPU) {\r
-          Name (_HID, EISAID("PNP0C04"))\r
-          Name (_CRS, ResourceTemplate () {\r
-            IO (Decode16, 0xF0, 0xF0, 0x00, 0x10)\r
-            IRQNoFlags () {13}\r
-            //\r
-            // list of IRQs occupied thus far: 9, 5, 10, 11, 2, 0, 8, 13\r
-            //\r
-          })\r
-        }\r
-\r
-        //\r
-        // Generic motherboard devices and pieces that don't fit anywhere else\r
-        //\r
-        Device(XTRA) {\r
-          Name (_HID, EISAID ("PNP0C02"))\r
-          Name (_UID, 0x01)\r
-          Name (_CRS, ResourceTemplate () {\r
-            IO (Decode16, 0x010, 0x010, 0x00, 0x10)\r
-            IO (Decode16, 0x022, 0x022, 0x00, 0x1E)\r
-            IO (Decode16, 0x044, 0x044, 0x00, 0x1C)\r
-            IO (Decode16, 0x062, 0x062, 0x00, 0x02)\r
-            IO (Decode16, 0x065, 0x065, 0x00, 0x0B)\r
-            IO (Decode16, 0x072, 0x072, 0x00, 0x0E)\r
-            IO (Decode16, 0x080, 0x080, 0x00, 0x01)\r
-            IO (Decode16, 0x084, 0x084, 0x00, 0x03)\r
-            IO (Decode16, 0x088, 0x088, 0x00, 0x01)\r
-            IO (Decode16, 0x08c, 0x08c, 0x00, 0x03)\r
-            IO (Decode16, 0x090, 0x090, 0x00, 0x10)\r
-            IO (Decode16, 0x0A2, 0x0A2, 0x00, 0x1E)\r
-            IO (Decode16, 0x0E0, 0x0E0, 0x00, 0x10)\r
-            IO (Decode16, 0x1E0, 0x1E0, 0x00, 0x10)\r
-            IO (Decode16, 0x160, 0x160, 0x00, 0x10)\r
-            IO (Decode16, 0x278, 0x278, 0x00, 0x08)\r
-            IO (Decode16, 0x370, 0x370, 0x00, 0x02)\r
-            IO (Decode16, 0x378, 0x378, 0x00, 0x08)\r
-            IO (Decode16, FixedPcdGet16 (PcdDebugIoPort), FixedPcdGet16 (PcdDebugIoPort), 0x00, 0x01)\r
-            IO (Decode16, 0x440, 0x440, 0x00, 0x10)\r
-            IO (Decode16, 0x678, 0x678, 0x00, 0x08)\r
-            IO (Decode16, 0x778, 0x778, 0x00, 0x08)\r
-            IO (Decode16, 0xafe0, 0xafe0, 0x00, 0x04)      // QEMU GPE0 BLK\r
-            IO (Decode16, 0xb000, 0xb000, 0x00, 0x40)      // PMBLK1\r
-            Memory32Fixed (ReadOnly, 0xFEC00000, 0x1000)   // IO APIC\r
-            Memory32Fixed (ReadOnly, 0xFEE00000, 0x100000) // LAPIC\r
-          })\r
-        }\r
-\r
-        //\r
-        // PS/2 Keyboard and PC/AT Enhanced Keyboard 101/102\r
-        //\r
-        Device (PS2K) {\r
-          Name (_HID, EISAID ("PNP0303"))\r
-          Name (_CID, EISAID ("PNP030B"))\r
-          Name(_CRS,ResourceTemplate() {\r
-            IO (Decode16, 0x60, 0x60, 0x00, 0x01)\r
-            IO (Decode16, 0x64, 0x64, 0x00, 0x01)\r
-            IRQNoFlags () {1}\r
-            //\r
-            // list of IRQs occupied thus far: 9, 5, 10, 11, 2, 0, 8, 13, 1\r
-            //\r
-          })\r
-        }\r
-\r
-        //\r
-        // PS/2 Mouse and Microsoft Mouse\r
-        //\r
-        Device (PS2M) {  // PS/2 stype mouse port\r
-          Name (_HID, EISAID ("PNP0F03"))\r
-          Name (_CID, EISAID ("PNP0F13"))\r
-          Name (_CRS, ResourceTemplate() {\r
-            IRQNoFlags () {12}\r
-            //\r
-            // list of IRQs occupied thus far:\r
-            // 9, 5, 10, 11, 2, 0, 8, 13, 1, 12\r
-            //\r
-          })\r
-        }\r
-\r
-        //\r
-        // UART Serial Port - COM1\r
-        //\r
-        Device (UAR1) {\r
-          Name (_HID, EISAID ("PNP0501"))\r
-          Name (_DDN, "COM1")\r
-          Name (_UID, 0x01)\r
-          Name(_CRS,ResourceTemplate() {\r
-            IO (Decode16, 0x3F8, 0x3F8, 0x01, 0x08)\r
-            IRQ (Edge, ActiveHigh, Exclusive, ) {4}\r
-            //\r
-            // list of IRQs occupied thus far:\r
-            // 9, 5, 10, 11, 2, 0, 8, 13, 1, 12, 4\r
-            //\r
-          })\r
-        }\r
-\r
-        //\r
-        // UART Serial Port - COM2\r
-        //\r
-        Device (UAR2) {\r
-          Name (_HID, EISAID ("PNP0501"))\r
-          Name (_DDN, "COM2")\r
-          Name (_UID, 0x02)\r
-          Name(_CRS,ResourceTemplate() {\r
-            IO (Decode16, 0x2F8, 0x2F8, 0x01, 0x08)\r
-            IRQ (Edge, ActiveHigh, Exclusive, ) {3}\r
-            //\r
-            // list of IRQs occupied thus far:\r
-            // 9, 5, 10, 11, 2, 0, 8, 13, 1, 12, 4, 3\r
-            //\r
-          })\r
-        }\r
-\r
-        //\r
-        // Floppy Disk Controller\r
-        //\r
-        Device (FDC) {\r
-          Name (_HID, EISAID ("PNP0700"))\r
-          Name (_CRS,ResourceTemplate() {\r
-            IO (Decode16, 0x3F0, 0x3F0, 0x01, 0x06)\r
-            IO (Decode16, 0x3F7, 0x3F7, 0x01, 0x01)\r
-            IRQNoFlags () {6}\r
-            //\r
-            // list of IRQs occupied thus far:\r
-            // 9, 5, 10, 11, 2, 0, 8, 13, 1, 12, 4, 3, 6\r
-            //\r
-            DMA (Compatibility, NotBusMaster, Transfer8) {2}\r
-          })\r
-        }\r
-\r
-        //\r
-        // parallel port -- no DMA for now\r
-        //\r
-        Device (PAR1) {\r
-          Name (_HID, EISAID ("PNP0400"))\r
-          Name (_DDN, "LPT1")\r
-          Name (_UID, 0x01)\r
-          Name(_CRS, ResourceTemplate() {\r
-            IO (Decode16, 0x0378, 0x0378, 0x00, 0x08)\r
-            IRQNoFlags () {7}\r
-            //\r
-            // list of IRQs occupied thus far:\r
-            // 9, 5, 10, 11, 2, 0, 8, 13, 1, 12, 4, 3, 6, 7\r
-            // in order:\r
-            // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13\r
-            //\r
-          })\r
-        }\r
-      }\r
-    }\r
-  }\r
-}\r

diff --git a/OvmfPkg/AcpiTables/Facp.aslc b/OvmfPkg/AcpiTables/Facp.aslc
deleted file mode 100644 (file)
index 657a8c6..0000000
--- a/OvmfPkg/AcpiTables/Facp.aslc
+++ /dev/null
@@ -1,89 +0,0 @@
-/** @file\r
-  FACP Table\r
-\r
-  Copyright (c) 2013, Red Hat, Inc.\r
-  Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-#include "Platform.h"\r
-\r
-EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {\r
-  {\r
-    EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,\r
-    sizeof (EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE),\r
-    EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,\r
-    0,                          // to make sum of entire table == 0\r
-    {EFI_ACPI_OEM_ID},          // OEMID is a 6 bytes long field\r
-    EFI_ACPI_OEM_TABLE_ID,      // OEM table identification(8 bytes long)\r
-    EFI_ACPI_OEM_REVISION,      // OEM revision number\r
-    EFI_ACPI_CREATOR_ID,        // ASL compiler vendor ID\r
-    EFI_ACPI_CREATOR_REVISION   // ASL compiler revision number\r
-  },\r
-  0,                // Physical address of FACS\r
-  0,                // Physical address of DSDT\r
-  RESERVED,         // System Interrupt Model in ACPI 1.0, eliminated in 2.0\r
-  EFI_ACPI_2_0_PM_PROFILE_UNSPECIFIED, // Preferred PM profile\r
-  SCI_INT_VECTOR,   // System vector of SCI interrupt\r
-  SMI_CMD_IO_PORT,  // Port address of SMI command port\r
-  ACPI_ENABLE,      // value to write to port smi_cmd to enable ACPI\r
-  ACPI_DISABLE,     // value to write to port smi_cmd to disable ACPI\r
-  S4BIOS_REQ,       // Value to write to SMI CMD port to enter the S4BIOS state\r
-  0,                // PState control\r
-  PM1a_EVT_BLK,     // Port address of Power Mgt 1a Event Reg Blk\r
-  0,                // Power Mgt 1b Event Reg Blk unsupported\r
-  PM1a_CNT_BLK,     // Port address of Power Mgt 1a Ctrl Reg Blk\r
-  0,                // Power Mgt 1b Ctrl Reg Blk unsupported\r
-  0,                // Power Mgt 2  Ctrl Reg Blk unsupported\r
-  PM_TMR_BLK,       // Port address of Power Mgt Timer Ctrl Reg Blk\r
-  GPE0_BLK,         // Port addr of General Purpose Event 0 Reg Blk\r
-  0,                // General Purpose Event 1 Reg Blk unsupported\r
-  PM1_EVT_LEN,      // Byte Length of ports at pm1X_evt_blk\r
-  PM1_CNT_LEN,      // Byte Length of ports at pm1X_cnt_blk\r
-  0,                // Power Mgt 2 Ctrl Reg Blk unsupported\r
-  PM_TM_LEN,        // Byte Length of ports at pm_tm_blk\r
-  GPE0_BLK_LEN,     // Byte Length of ports at gpe0_blk\r
-  0,                // General Purpose Event 1 Reg Blk unsupported\r
-  0,                // General Purpose Event 1 Reg Blk unsupported\r
-  0,                // _CST support\r
-  P_LVL2_LAT,       // worst case HW latency to enter/exit C2 state\r
-  P_LVL3_LAT,       // worst case HW latency to enter/exit C3 state\r
-  FLUSH_SIZE,       // Size of area read to flush caches\r
-  FLUSH_STRIDE,     // Stride used in flushing caches\r
-  DUTY_OFFSET,      // bit location of duty cycle field in p_cnt reg\r
-  DUTY_WIDTH,       // bit width of duty cycle field in p_cnt reg\r
-  DAY_ALRM,         // index to day-of-month alarm in RTC CMOS RAM\r
-  MON_ALRM,         // index to month-of-year alarm in RTC CMOS RAM\r
-  CENTURY,          // index to century in RTC CMOS RAM\r
-  0x0000,           // Boot architecture flag (16-bit)\r
-  RESERVED,         // reserved\r
-  FLAG,             // Fixed feature flags\r
-  GAS2_IO(RESET_REG, 1), // Extended address of the Reset Register\r
-  RESET_VALUE,           // Value for the Reset Register to reset the system\r
-  { RESERVED },     // reserved[3]\r
-  0,                // 64-bit physical address of FACS, set at installation\r
-  0,                // 64-bit physical address of DSDT, set at installation\r
-\r
-  GAS2_IO(PM1a_EVT_BLK, PM1_EVT_LEN), // Ext. addr. of PM 1a Event Reg Blk\r
-  { 0 },                              // PM 1b Event Reg Blk unsupported\r
-  GAS2_IO(PM1a_CNT_BLK, PM1_CNT_LEN), // Ext. addr. of PM 1a Ctrl Reg Blk\r
-  { 0 },                              // PM 1b Ctrl Reg Blk unsupported\r
-  { 0 },                              // PM 2  Ctrl Reg Blk unsupported\r
-  GAS2_IO(PM_TMR_BLK, PM_TM_LEN),     // Ext. addr. of PM Timer Ctrl Reg Blk\r
-  GAS2_IO(GPE0_BLK, GPE0_BLK_LEN),    // Ext. addr. of GPE 0 Reg Blk\r
-  { 0 }                               // GPE 1 Reg Blk unsupported\r
-};\r
-\r
-\r
-VOID*\r
-ReferenceAcpiTable (\r
-  VOID\r
-  )\r
-{\r
-  //\r
-  // Reference the table being generated to prevent the optimizer from removing the\r
-  // data structure from the executable\r
-  //\r
-  return (VOID*)&FACP;\r
-}\r

diff --git a/OvmfPkg/AcpiTables/Facs.aslc b/OvmfPkg/AcpiTables/Facs.aslc
deleted file mode 100644 (file)
index d4e6ac4..0000000
--- a/OvmfPkg/AcpiTables/Facs.aslc
+++ /dev/null
@@ -1,78 +0,0 @@
-/** @file\r
-  FACS Table\r
-\r
-  Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-#include <IndustryStandard/Acpi.h>\r
-\r
-EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE FACS = {\r
-  EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE,\r
-  sizeof (EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE),\r
-\r
-  //\r
-  // Hardware Signature will be updated at runtime\r
-  //\r
-  0x00000000,\r
-  0x00,\r
-  0x00,\r
-  0x00,\r
-  {\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE,\r
-    EFI_ACPI_RESERVED_BYTE\r
-  }\r
-};\r
-\r
-\r
-VOID*\r
-ReferenceAcpiTable (\r
-  VOID\r
-  )\r
-{\r
-  //\r
-  // Reference the table being generated to prevent the optimizer from removing the\r
-  // data structure from the executable\r
-  //\r
-  return (VOID*)&FACS;\r
-}\r
-\r

diff --git a/OvmfPkg/AcpiTables/Madt.aslc b/OvmfPkg/AcpiTables/Madt.aslc
deleted file mode 100644 (file)
index 02fc364..0000000
--- a/OvmfPkg/AcpiTables/Madt.aslc
+++ /dev/null
@@ -1,153 +0,0 @@
-/** @file\r
-  MADT Table\r
-\r
-  This file contains a structure definition for the ACPI 1.0 Multiple APIC\r
-  Description Table (MADT).\r
-\r
-  Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-#include <IndustryStandard/Acpi.h>\r
-#include <Platform.h>\r
-\r
-//\r
-// Local APIC address\r
-//\r
-#define EFI_ACPI_LOCAL_APIC_ADDRESS 0xFEE00000 // TBD\r
-\r
-//\r
-// Multiple APIC Flags are defined in AcpiX.0.h\r
-//\r
-#define EFI_ACPI_1_0_MULTIPLE_APIC_FLAGS (EFI_ACPI_1_0_PCAT_COMPAT)\r
-\r
-//\r
-// Define the number of each table type.\r
-// This is where the table layout is modified.\r
-//\r
-#define EFI_ACPI_PROCESSOR_LOCAL_APIC_COUNT           1\r
-#define EFI_ACPI_INTERRUPT_SOURCE_OVERRIDE_COUNT      2\r
-#define EFI_ACPI_IO_APIC_COUNT                        1\r
-\r
-//\r
-// Ensure proper structure formats\r
-//\r
-#pragma pack (1)\r
-\r
-//\r
-// ACPI 1.0 MADT structure\r
-//\r
-typedef struct {\r
-  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;\r
-\r
-#if EFI_ACPI_PROCESSOR_LOCAL_APIC_COUNT > 0\r
-  EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC_STRUCTURE           LocalApic[EFI_ACPI_PROCESSOR_LOCAL_APIC_COUNT];\r
-#endif\r
-\r
-#if EFI_ACPI_INTERRUPT_SOURCE_OVERRIDE_COUNT > 0\r
-  EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE      Iso[EFI_ACPI_INTERRUPT_SOURCE_OVERRIDE_COUNT];\r
-#endif\r
-\r
-#if EFI_ACPI_IO_APIC_COUNT > 0\r
-  EFI_ACPI_1_0_IO_APIC_STRUCTURE                        IoApic[EFI_ACPI_IO_APIC_COUNT];\r
-#endif\r
-\r
-} EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;\r
-\r
-#pragma pack ()\r
-\r
-//\r
-// Multiple APIC Description Table\r
-//\r
-EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {\r
-  {\r
-    {\r
-      EFI_ACPI_1_0_APIC_SIGNATURE,\r
-      sizeof (EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE),\r
-      EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION,\r
-      0x00,                                                     // Checksum will be updated at runtime\r
-      {EFI_ACPI_OEM_ID},\r
-      EFI_ACPI_OEM_TABLE_ID,\r
-      EFI_ACPI_OEM_REVISION,\r
-      EFI_ACPI_CREATOR_ID,\r
-      EFI_ACPI_CREATOR_REVISION\r
-    },\r
-\r
-    //\r
-    // MADT specific fields\r
-    //\r
-    EFI_ACPI_LOCAL_APIC_ADDRESS,\r
-    EFI_ACPI_1_0_MULTIPLE_APIC_FLAGS,\r
-  },\r
-\r
-  //\r
-  // Processor Local APIC Structure\r
-  //\r
-  {\r
-    {\r
-      EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC,                        // Type\r
-      sizeof (EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC_STRUCTURE),     // Length\r
-      0x00,                                                     // Processor ID\r
-      0x00,                                                     // Local APIC ID\r
-      0x00000001                                                // Flags - Enabled by default\r
-    }\r
-  },\r
-\r
-  //\r
-  // Interrupt Source Override Structure\r
-  //\r
-\r
-  {\r
-    {\r
-      //\r
-      // IRQ0=>IRQ2 Interrupt Source Override Structure\r
-      //\r
-      EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE,                   // Type\r
-      sizeof (EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE),// Length\r
-      0x00,                                                     // Bus - ISA\r
-      0x00,                                                     // Source - IRQ0\r
-      0x00000002,                                               // Global System Interrupt - IRQ2\r
-      0x0000                                                    // Flags - Conforms to specifications of the bus\r
-    },\r
-\r
-    {\r
-      //\r
-      // ISO (SCI Active High) Interrupt Source Override Structure\r
-      //\r
-      EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE,                   // Type\r
-      sizeof (EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE),// Length\r
-      0x00,                                                     // Bus - ISA\r
-      0x09,                                                     // Source - IRQ0\r
-      0x00000009,                                               // Global System Interrupt - IRQ2\r
-      0x000D                                                    // Flags - Level-tiggered, Active High\r
-    }\r
-  },\r
-\r
-  //\r
-  // IO APIC Structure\r
-  //\r
-  {\r
-    {\r
-      EFI_ACPI_1_0_IO_APIC,                                     // Type\r
-      sizeof (EFI_ACPI_1_0_IO_APIC_STRUCTURE),                  // Length\r
-      0x02,                                                     // IO APIC ID\r
-      EFI_ACPI_RESERVED_BYTE,                                   // Reserved\r
-      0xFEC00000,                                               // IO APIC Address (physical)\r
-      0x00000000                                                // Global System Interrupt Base\r
-    }\r
-  },\r
-};\r
-\r
-\r
-VOID*\r
-ReferenceAcpiTable (\r
-  VOID\r
-  )\r
-{\r
-  //\r
-  // Reference the table being generated to prevent the optimizer from removing the\r
-  // data structure from the executable\r
-  //\r
-  return (VOID*)&Madt;\r
-}\r

diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h
deleted file mode 100644 (file)
index e4ee848..0000000
--- a/OvmfPkg/AcpiTables/Platform.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/** @file\r
-  Platform specific defines for constructing ACPI tables\r
-\r
-  Copyright (c) 2012, 2013, Red Hat, Inc.\r
-  Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>\r
-  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-#ifndef _Platform_h_INCLUDED_\r
-#define _Platform_h_INCLUDED_\r
-\r
-#include <PiDxe.h>\r
-#include <IndustryStandard/Acpi.h>\r
-\r
-//\r
-// ACPI table information used to initialize tables.\r
-//\r
-#define EFI_ACPI_OEM_ID           'O','V','M','F',' ',' '   // OEMID 6 bytes long\r
-#define EFI_ACPI_OEM_TABLE_ID     SIGNATURE_64('O','V','M','F','E','D','K','2') // OEM table id 8 bytes long\r
-#define EFI_ACPI_OEM_REVISION     0x20130221\r
-#define EFI_ACPI_CREATOR_ID       SIGNATURE_32('O','V','M','F')\r
-#define EFI_ACPI_CREATOR_REVISION 0x00000099\r
-\r
-#define SCI_INT_VECTOR  0x0009\r
-#define SMI_CMD_IO_PORT 0xB2\r
-#define ACPI_ENABLE     0xF1\r
-#define ACPI_DISABLE    0xF0\r
-#define S4BIOS_REQ      0x00\r
-#define PM1a_EVT_BLK    0x0000b000\r
-#define PM1a_CNT_BLK    0x0000b004\r
-#define PM_TMR_BLK      0x0000b008\r
-#define GPE0_BLK        0x0000afe0\r
-#define PM1_EVT_LEN     0x04\r
-#define PM1_CNT_LEN     0x02\r
-#define PM_TM_LEN       0x04\r
-#define GPE0_BLK_LEN    0x04\r
-#define RESERVED        0x00\r
-#define P_LVL2_LAT      0x0065\r
-#define P_LVL3_LAT      0x03E9\r
-#define FLUSH_SIZE      0x0000\r
-#define FLUSH_STRIDE    0x0000\r
-#define DUTY_OFFSET     0x00\r
-#define DUTY_WIDTH      0x00\r
-#define DAY_ALRM        0x00\r
-#define MON_ALRM        0x00\r
-#define CENTURY         0x00\r
-#define FLAG            (EFI_ACPI_2_0_WBINVD | \\r
-                         EFI_ACPI_2_0_PROC_C1 | \\r
-                         EFI_ACPI_2_0_SLP_BUTTON | \\r
-                         EFI_ACPI_2_0_RTC_S4 | \\r
-                         EFI_ACPI_2_0_RESET_REG_SUP)\r
-#define RESET_REG       0xCF9\r
-#define RESET_VALUE     (BIT2 | BIT1) // PIIX3 Reset CPU + System Reset\r
-\r
-//\r
-// Byte-aligned IO port register block initializer for\r
-// EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE\r
-//\r
-#define GAS2_IO(Base, Size) {                             \\r
-          EFI_ACPI_2_0_SYSTEM_IO, /* AddressSpaceId    */ \\r
-          (Size) * 8,             /* RegisterBitWidth  */ \\r
-          0,                      /* RegisterBitOffset */ \\r
-          0,                      /* Reserved          */ \\r
-          (Base)                  /* Address           */ \\r
-          }\r
-\r
-#endif\r

diff --git a/OvmfPkg/AcpiTables/Ssdt.asl b/OvmfPkg/AcpiTables/Ssdt.asl
deleted file mode 100644 (file)
index 6926e56..0000000
--- a/OvmfPkg/AcpiTables/Ssdt.asl
+++ /dev/null
@@ -1,13 +0,0 @@
-/** @file\r
-  Placeholder for runtime-generated objects.\r
-\r
-  This empty table provides only a header for dynamic copying and extension,\r
-  and a trigger for QemuInstallAcpiSsdtTable().\r
-\r
-  Copyright (C) 2012 Red Hat, Inc.\r
-\r
-  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-**/\r
-\r
-DefinitionBlock ("Ssdt.aml", "SSDT", 1, "REDHAT", "OVMF    ", 1) {\r
-}\r