OvmfPkg: switch IA32, IA32X64, X64 to the fw_cfg-only ACPI platform driver

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32X64.fdf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index f10108d7ee6242f53cbe24e8a7a8b94308d56325..02fd8f0c413e05cc11ceb9357eb7747afd90d4f1 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -281,8 +281,7 @@ INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 INF  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
 \r
 INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
-INF  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
-INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
+INF  OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
@@ -490,12 +489,6 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
-[Rule.Common.USER_DEFINED.ACPITABLE]\r
-  FILE FREEFORM = $(NAMED_GUID) {\r
-    RAW ACPI               |.acpi\r
-    RAW ASL                |.aml\r
-  }\r
-\r
 [Rule.Common.USER_DEFINED.CSM]\r
   FILE FREEFORM = $(NAMED_GUID) {\r
     RAW BIN                |.bin\r