1) add gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported and gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv to replace the MACRO definitions.
2) Fix a bug in Pei dispatcher to suppoprt PEI Apriori file
3) Enable PEI apriori file in Nt32.FDF

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4118 6f19259b-4bc3-4df7-8a09-765794883524
diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 6404f71..51d4fe3 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -298,6 +298,9 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00c000

   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10

 

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported|6

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv|32

+

 [PcdsFeatureFlag.IA32]

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled|TRUE

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled|TRUE

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 9821714..db378b4 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -123,6 +123,14 @@
   ##

   #  PEI Phase modules

   ##

+  ##

+  #  PEI Apriori file example, more PEIM module added later.

+  ##

+APRIORI PEI {

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

+  INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf

+  }

+

 INF  MdeModulePkg/Core/Pei/PeiMain.inf

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

 INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf