Fix EDKT 150 to make IPF XIP module 16-byte align. Create new IPF_PEI_CORE, IPF_PE32_PEIM ffs layout for IPF XIP module. And add 12 bytes Blank.pad file in build directory. And add PeiEntryPoint library class in PeiStatuCode module msa file.

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

1 files changed, 10 insertions, 17 deletions

diff --git a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa
index 6d0133c910..91579b8c9a 100644
--- a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa
+++ b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--Copyright (c) 2006, Intel Corporation

-Copyright (c) 2006, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

--->

 <ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>PeiStatusCode</ModuleName>

@@ -18,11 +8,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Abstract>Generic Status code Pei driver</Abstract>

     <Description>Customized output devices based on feature flags.</Description>

     <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>

-    <License>All rights reserved. This program and the accompanying materials

-      are licensed and made available under the terms and conditions of the BSD License

-      which accompanies this distribution.  The full text of the license may be found at

-      http://opensource.org/licenses/bsd-license.php

-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

@@ -62,6 +52,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>OemHookStatusCodeLib</Keyword>

     </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PeimEntryPoint</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>PeiStatusCode.h</Filename>

@@ -78,7 +71,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <PpiCName>gEfiPeiStatusCodePpiGuid</PpiCName>

     </Ppi>

   </PPIs>

-  <Guids> 

+  <Guids>

     <GuidCNames Usage="SOMETIMES_CONSUMED">

       <GuidCName>gMemoryStatusCodeRecordGuid</GuidCName>

     </GuidCNames>

@@ -112,4 +105,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText/>

     </PcdEntry>

   </PcdCoded>

-</ModuleSurfaceArea>

+</ModuleSurfaceArea>
\ No newline at end of file