Remove extra references to binary INFs from DSC file

Add build rules for BINARY INFs to the FDF files.

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

diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index c67848618d29ef5e6259643df97c15a3a6b29aa1..00b9b6117088554e5a757508076917f5ab13d2c5 100644 (file)
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -198,9 +198,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
-\r
-INF  EdkShellBinPkg/FullShell/FullShell.inf\r
+INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
 \r
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
   SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
@@ -286,6 +285,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
@@ -293,6 +300,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

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 3556812f71303f0e2f93cd2fc5948b3839171279..915f3d364bb0b327171696656fdaed97e3918a97 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -333,9 +333,3 @@
   MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
   OvmfPkg/AcpiTables/AcpiTables.inf\r
-\r
-  #\r
-  # Remove the following statements after build tool issue with Binary INFs is resolved\r
-  #\r
-  FatBinPkg/EnhancedFatDxe/Fat.inf\r
-  EdkShellBinPkg/FullShell/FullShell.inf\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 7c34d8f72070a78b7f77446e3a2d1f23ccd48d92..43d59cfcf7688712ce8dee3dc9325986e6ae8cc4 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -335,9 +335,3 @@
   MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
   OvmfPkg/AcpiTables/AcpiTables.inf\r
-\r
-  #\r
-  # Remove the following statements after build tool issue with Binary INFs is resolved\r
-  #\r
-  FatBinPkg/EnhancedFatDxe/Fat.inf\r
-  EdkShellBinPkg/FullShell/FullShell.inf\r

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

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 15bf5505d0662c797d37f276a6ea24dd563d72ec..fa5a12139e3ab84efad593798d1c10f2687d4f5b 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -334,10 +334,3 @@
   MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
   OvmfPkg/AcpiTables/AcpiTables.inf\r
-  \r
-  #\r
-  # Remove the following statements after build tool issue with Binary INFs is resolved\r
-  #\r
-  FatBinPkg/EnhancedFatDxe/Fat.inf\r
-  EdkShellBinPkg/FullShell/FullShell.inf\r
-\r