commit d40d3ba499c9eba392729fe6612a716e1365cfca
author jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> Wed Oct 07 16:01:09 2009 +0000
committer jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> Wed Oct 07 16:01:09 2009 +0000
tree 408fbabf3434f058eacd6b69317a104e2bc53c15
parent 9337cf8c99c503d7c13e901ea605e460fb836393

OVMF: Align PE images in ROM, and strip relocations were possible.

Align the PE32/32+ images in the ROM for XIP (execute in place) images
to function properly following the change in r9327.  Also, convert
pre-memory PEIM's to use the TE image format and strip-relocation
data from image.  This saves a little space, and provides a sample
usage of TE images.

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

OvmfPkg/OvmfPkg.fdf

diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index f20a9d5..8d72e6b 100644
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -201,9 +201,9 @@
 #  PEI Phase modules

 #

 INF  MdeModulePkg/Core/Pei/PeiMain.inf

-INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf

-INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

-INF  OvmfPkg/PlatformPei/PlatformPei.inf

+INF  RuleOverride=NORELOC MdeModulePkg/Universal/PCD/Pei/Pcd.inf

+INF  RuleOverride=NORELOC IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

+INF  RuleOverride=NORELOC OvmfPkg/PlatformPei/PlatformPei.inf

 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

 

 #

@@ -230,7 +230,7 @@
 

 [Rule.Common.PEI_CORE]

   FILE PEI_CORE = $(NAMED_GUID) {

-    PE32     PE32           |.efi

+    PE32     PE32   Align=32    |.efi

     UI       STRING ="$(MODULE_NAME)" Optional

     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

@@ -242,10 +242,18 @@
     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

+     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                      |.efi

+     PE32      PE32   Align=32           |.efi

      UI       STRING="$(MODULE_NAME)" Optional

      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }