Merge the PI enabling works from the branch

First round of PI enabling work:
1) PiPeiCis changes (CONST, EFI_PEI_FILE_HANDLE.. etc)
2) Make use of FirmwareVolume 2 protocol.
3) Verified for Nt32Pkg and real platform for S3.

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

3 files changed, 7 insertions, 1 deletions

diff --git a/MdePkg/Library/UefiLib/UefiLib.c b/MdePkg/Library/UefiLib/UefiLib.c
index 28f5c7d..12a717a 100644
--- a/MdePkg/Library/UefiLib/UefiLib.c
+++ b/MdePkg/Library/UefiLib/UefiLib.c
@@ -1209,3 +1209,4 @@ FreeUnicodeStringTable (
   return EFI_SUCCESS;

 }

 

+

diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/UefiLib.inf
index eac1928..7aa1812 100644
--- a/MdePkg/Library/UefiLib/UefiLib.inf
+++ b/MdePkg/Library/UefiLib/UefiLib.inf
@@ -67,9 +67,10 @@
   gEfiDriverConfigurationProtocolGuid           # SOMETIMES_CONSUMED

   gEfiDriverDiagnosticsProtocolGuid             # SOMETIMES_CONSUMED

   gEfiDriverDiagnostics2ProtocolGuid             # SOMETIMES_CONSUMED

+  gEfiFirmwareVolume2ProtocolGuid               # ALWAYS_CONSUMED

 

 

-[FixedPcd.common]

+[Pcd.common]

   gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize

 

 [FeaturePcd.common]

diff --git a/MdePkg/Library/UefiLib/UefiLibInternal.h b/MdePkg/Library/UefiLib/UefiLibInternal.h
index 82ba4c4..b21e5d1 100644
--- a/MdePkg/Library/UefiLib/UefiLibInternal.h
+++ b/MdePkg/Library/UefiLib/UefiLibInternal.h
@@ -21,6 +21,9 @@
 #include <Protocol/DriverConfiguration.h>

 #include <Protocol/DriverDiagnostics.h>

 #include <Protocol/DriverDiagnostics2.h>

+#include <Protocol/FirmwareVolume2.h>

+#include <Protocol/LoadedImage.h>

+

 #include <Guid/EventGroup.h>

 #include <Guid/EventLegacyBios.h>

 #include <Library/UefiLib.h>

@@ -32,4 +35,5 @@
 #include <Library/PcdLib.h>

 #include <Library/PrintLib.h>

 

+

 #endif