diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-03-02 02:50:32 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-03-02 02:50:32 +0000 |
| commit | d989c453eaf99c4278152818c78aee5fa08bd6e8 (patch) | |
| tree | 7fd7f9adaf8a2ae0f98001b33c01b72f4321db07 | |
| parent | b8758b6e6f88510e531a758ca353ff1d24a9f00c (diff) | |
| download | edk2-d989c453eaf99c4278152818c78aee5fa08bd6e8.tar.gz edk2-d989c453eaf99c4278152818c78aee5fa08bd6e8.tar.bz2 edk2-d989c453eaf99c4278152818c78aee5fa08bd6e8.zip | |
Still use |.efi Rule for INF file with binary EFI image, because the binary EFI image specified INF file is not in output directory.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10150 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | DuetPkg/DuetPkg.fdf | 8 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkg.fdf | 19 |
2 files changed, 24 insertions, 3 deletions
diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf index b9079810a4..0e5bd9b1b9 100644 --- a/DuetPkg/DuetPkg.fdf +++ b/DuetPkg/DuetPkg.fdf @@ -121,7 +121,7 @@ INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf INF DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
# Binary INF file to support toggle among different CPU architectures.
-INF FatBinPkg/EnhancedFatDxe/Fat.inf
+INF RuleOverride=BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
SECTION RAW = MdeModulePkg/Logo/Logo.bmp
@@ -155,3 +155,9 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
}
+[Rule.Common.UEFI_DRIVER.BINARY]
+ FILE DRIVER = $(NAMED_GUID) {
+ DXE_DEPEX DXE_DEPEX Optional |.depex
+ PE32 PE32 |.efi
+ }
+
diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf index 1c5d82d0ac..47f8518bee 100644 --- a/OvmfPkg/OvmfPkg.fdf +++ b/OvmfPkg/OvmfPkg.fdf @@ -197,9 +197,9 @@ INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
INF RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf
-INF FatBinPkg/EnhancedFatDxe/Fat.inf
+INF RuleOverride=BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
-INF EdkShellBinPkg/FullShell/FullShell.inf
+INF RuleOverride=BINARY EdkShellBinPkg/FullShell/FullShell.inf
FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress
@@ -330,6 +330,21 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 { VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
+[Rule.Common.UEFI_DRIVER.BINARY]
+ FILE DRIVER = $(NAMED_GUID) {
+ DXE_DEPEX DXE_DEPEX Optional |.depex
+ PE32 PE32 |.efi
+ UI STRING="$(MODULE_NAME)" Optional
+ VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
+ }
+
+[Rule.Common.UEFI_APPLICATION.BINARY]
+ FILE APPLICATION = $(NAMED_GUID) {
+ PE32 PE32 |.efi
+ UI STRING="$(MODULE_NAME)" Optional
+ VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
+ }
+
[Rule.Common.USER_DEFINED.ACPITABLE]
FILE FREEFORM = $(NAMED_GUID) {
RAW ACPI |.acpi
|