1. update AcpiTable module type to USER_DEFINED

2. added ACPITABLE rule for AcpiTable modules in fdf files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9039 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/AcpiTables/AcpiTables.inf b/OvmfPkg/AcpiTables/AcpiTables.inf
index 6669cc78e18602f5818d82e3bc7e70d83611da9c..84ee1b1f3cc9640f7334d189e7bdb4105ea7884d 100755 (executable)
--- a/OvmfPkg/AcpiTables/AcpiTables.inf
+++ b/OvmfPkg/AcpiTables/AcpiTables.inf
@@ -3,7 +3,7 @@
 #\r
 #  ACPI table data and ASL sources required to boot the platform.\r
 #\r
-#  Copyright (c) 2008, Intel Corporation. <BR>\r
+#  Copyright (c) 2008 - 2009, Intel Corporation. <BR>\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -18,7 +18,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PlatformAcpiTables\r
   FILE_GUID                      = 7E374E25-8E01-4FEE-87F2-390C23C606CD\r
-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = USER_DEFINED\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r

diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index a15153f280f342011f76a45600d0d1cd9fb16cbe..4b36af6383bcde432d606557a99eda944491f8de 100644 (file)
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -296,7 +296,7 @@ INF  RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/Bin/ResetVector.inf
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
-[Rule.Common.DXE_DRIVER.ACPITABLE]\r
+[Rule.Common.USER_DEFINED.ACPITABLE]\r
   FILE FREEFORM = $(NAMED_GUID) {\r
     RAW ACPI               |.acpi\r
     RAW ASL                |.aml\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 1640d368b55c229e164b5207ac9bb56f2d81f575..9c061454bfff3de2be7abf4dd46e2e91faf9bb4b 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -146,7 +146,7 @@ INF  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
 \r
 INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
-INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
+INF  RuleOverride = ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
 \r
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
     SECTION PE32 = FatBinPkg/EnhancedFatDxe/X64/Fat.efi\r
@@ -303,10 +303,10 @@ FILE RAW = 1BA0062E-C779-4582-8566-336AE8F78F09 {
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
-[Rule.Common.DXE_DRIVER.ACPITABLE]\r
+[Rule.Common.USER_DEFINED.ACPITABLE]\r
   FILE FREEFORM = $(NAMED_GUID) {\r
-    RAW ACPI               |.acpi\r
-    RAW ASL                |.aml\r
+    RAW ACPI |.acpi\r
+    RAW ASL  |.aml\r
   }\r
 \r
 [Rule.Common.SEC.RESET_VECTOR]\r