This is a port of 55e96f9c601781b8dc52c40747922f6ca3521f9e / r17902 to
EmulatorPkg:
commit 55e96f9c601781b8dc52c40747922f6ca3521f9e
Author: Ruiyu Ni <ruiyu...@intel.com>
Date: Thu Jul 9 08:55:23 2015 +0000
OvmfPkg: Fix GCC49 build hang in PeiCore
Cc: Andrew Fish <af...@apple.com>
Cc: Ruiyu Ni <ruiyu...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com>
---
EmulatorPkg/EmulatorPkg.fdf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
index a002389..385003c 100644
--- a/EmulatorPkg/EmulatorPkg.fdf
+++ b/EmulatorPkg/EmulatorPkg.fdf
@@ -227,7 +227,7 @@ FILE FREEFORM =
PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
[Rule.Common.SEC]
FILE SEC = $(NAMED_GUID) {
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi
+ PE32 PE32 Align=Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING ="$(MODULE_NAME)" Optional
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
@@ -235,7 +235,7 @@ FILE FREEFORM =
PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
[Rule.Common.PEI_CORE]
FILE PEI_CORE = $(NAMED_GUID) {
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi
+ PE32 PE32 Align=Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING ="$(MODULE_NAME)" Optional
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
@@ -243,7 +243,7 @@ FILE FREEFORM =
PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
[Rule.Common.PEIM]
FILE PEIM = $(NAMED_GUID) {
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi
+ PE32 PE32 Align=Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
--
2.6.2
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
