summaryrefslogtreecommitdiffstats
path: root/OvmfPkg
diff options
context:
space:
mode:
authorlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>2010-03-01 01:39:30 +0000
committerlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>2010-03-01 01:39:30 +0000
commita0b1646f55423e4c2140a9366e8434c682927ff8 (patch)
tree7bcbc6ef8d47f59b48fbbc8b2a6485c4288662ee /OvmfPkg
parent9c1ca96e425300c5087cceb9ca5261ecc58bc9ac (diff)
downloadedk2-a0b1646f55423e4c2140a9366e8434c682927ff8.tar.gz
edk2-a0b1646f55423e4c2140a9366e8434c682927ff8.tar.bz2
edk2-a0b1646f55423e4c2140a9366e8434c682927ff8.zip
Clean up Rules of Platform FDFs to apply only one EFI image and Depex for each driver.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10127 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'OvmfPkg')
-rw-r--r--OvmfPkg/OvmfPkg.fdf32
-rw-r--r--OvmfPkg/OvmfPkgIa32X64.fdf32
2 files changed, 32 insertions, 32 deletions
diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index c55b6a3b9a..1d7c8a911f 100644
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -252,39 +252,39 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
[Rule.Common.PEI_CORE]
FILE PEI_CORE = $(NAMED_GUID) {
- PE32 PE32 Align=32 |.efi
+ PE32 PE32 Align=32 $(MODULE_NAME).efi
UI STRING ="$(MODULE_NAME)" Optional
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.SEC]
FILE SEC = $(NAMED_GUID) {
- PE32 PE32 |.efi
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING ="$(MODULE_NAME)" Optional
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.PEIM.NORELOC]
FILE PEIM = $(NAMED_GUID) RELOCS_STRIPPED {
- PEI_DEPEX PEI_DEPEX Optional |.depex
- TE TE |.efi
+ PEI_DEPEX PEI_DEPEX Optional $(MODULE_NAME).depex
+ TE TE $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.PEIM]
FILE PEIM = $(NAMED_GUID) {
- PEI_DEPEX PEI_DEPEX Optional |.depex
- PE32 PE32 Align=32 |.efi
+ PEI_DEPEX PEI_DEPEX Optional $(MODULE_NAME).depex
+ PE32 PE32 Align=32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.PEIM.TIANOCOMPRESSED]
FILE PEIM = $(NAMED_GUID) {
- PEI_DEPEX PEI_DEPEX Optional |.depex
+ PEI_DEPEX PEI_DEPEX Optional $(MODULE_NAME).depex
GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32 |.efi
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
@@ -292,38 +292,38 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
- PE32 PE32 |.efi
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.UEFI_DRIVER]
FILE DRIVER = $(NAMED_GUID) {
- DXE_DEPEX DXE_DEPEX Optional |.depex
- PE32 PE32 |.efi
+ DXE_DEPEX DXE_DEPEX Optional $(MODULE_NAME).depex
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.DXE_DRIVER]
FILE DRIVER = $(NAMED_GUID) {
- DXE_DEPEX DXE_DEPEX Optional |.depex
- PE32 PE32 |.efi
+ DXE_DEPEX DXE_DEPEX Optional $(MODULE_NAME).depex
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.DXE_RUNTIME_DRIVER]
FILE DRIVER = $(NAMED_GUID) {
- DXE_DEPEX DXE_DEPEX Optional |.depex
- PE32 PE32 |.efi
+ DXE_DEPEX DXE_DEPEX Optional $(MODULE_NAME).depex
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.UEFI_APPLICATION]
FILE APPLICATION = $(NAMED_GUID) {
- PE32 PE32 |.efi
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 7e5c0d7cef..0d2286c919 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -258,39 +258,39 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
[Rule.Common.PEI_CORE]
FILE PEI_CORE = $(NAMED_GUID) {
- PE32 PE32 Align=32 |.efi
+ PE32 PE32 Align=32 $(MODULE_NAME).efi
UI STRING ="$(MODULE_NAME)" Optional
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.SEC]
FILE SEC = $(NAMED_GUID) {
- PE32 PE32 |.efi
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING ="$(MODULE_NAME)" Optional
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.PEIM.NORELOC]
FILE PEIM = $(NAMED_GUID) RELOCS_STRIPPED {
- PEI_DEPEX PEI_DEPEX Optional |.depex
- TE TE |.efi
+ PEI_DEPEX PEI_DEPEX Optional $(MODULE_NAME).depex
+ TE TE $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.PEIM]
FILE PEIM = $(NAMED_GUID) {
- PEI_DEPEX PEI_DEPEX Optional |.depex
- PE32 PE32 Align=32 |.efi
+ PEI_DEPEX PEI_DEPEX Optional $(MODULE_NAME).depex
+ PE32 PE32 Align=32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.PEIM.TIANOCOMPRESSED]
FILE PEIM = $(NAMED_GUID) {
- PEI_DEPEX PEI_DEPEX Optional |.depex
+ PEI_DEPEX PEI_DEPEX Optional $(MODULE_NAME).depex
GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32 |.efi
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
@@ -298,38 +298,38 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
- PE32 PE32 |.efi
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.UEFI_DRIVER]
FILE DRIVER = $(NAMED_GUID) {
- DXE_DEPEX DXE_DEPEX Optional |.depex
- PE32 PE32 |.efi
+ DXE_DEPEX DXE_DEPEX Optional $(MODULE_NAME).depex
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.DXE_DRIVER]
FILE DRIVER = $(NAMED_GUID) {
- DXE_DEPEX DXE_DEPEX Optional |.depex
- PE32 PE32 |.efi
+ DXE_DEPEX DXE_DEPEX Optional $(MODULE_NAME).depex
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.DXE_RUNTIME_DRIVER]
FILE DRIVER = $(NAMED_GUID) {
- DXE_DEPEX DXE_DEPEX Optional |.depex
- PE32 PE32 |.efi
+ DXE_DEPEX DXE_DEPEX Optional $(MODULE_NAME).depex
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
[Rule.Common.UEFI_APPLICATION]
FILE APPLICATION = $(NAMED_GUID) {
- PE32 PE32 |.efi
+ PE32 PE32 $(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}