Remove extra references to binary INFs from DSC file

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32X64.fdf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index c644ae96b0f74f9bae54ce83793b0c7168f58ab7..92d7ac58a1c55cf2d45ca1a76d2ce52d18261669 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -201,8 +201,8 @@ INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
 INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
 INF  OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf\r
 \r
-INF  FatBinPkg/EnhancedFatDxe/Fat.inf\r
-INF  EdkShellBinPkg/FullShell/FullShell.inf\r
+INF  RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf\r
 \r
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
   SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
@@ -289,6 +289,14 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
+[Rule.Common.UEFI_DRIVER.BINARY]\r
+  FILE APPLICATION = $(NAMED_GUID) {\r
+    DXE_DEPEX DXE_DEPEX Optional      |.depex\r
+    PE32      PE32                    |.efi\r
+    UI        STRING="$(MODULE_NAME)" Optional\r
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+  }\r
+  \r
 [Rule.Common.UEFI_APPLICATION]\r
   FILE APPLICATION = $(NAMED_GUID) {\r
     PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
@@ -296,6 +304,13 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
+[Rule.Common.UEFI_APPLICATION.BINARY]\r
+  FILE APPLICATION = $(NAMED_GUID) {\r
+    PE32      PE32                    |.efi\r
+    UI        STRING="$(MODULE_NAME)" Optional\r
+    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