IntelFsp2WrapperPkg: Update gFspWrapperTokenSpaceGuid to gIntelFsp2WrapperTokenSpaceGuid.
authorJiewen Yao <jiewen.yao@intel.com>
Fri, 20 May 2016 12:07:42 +0000 (20:07 +0800)
committerJiewen Yao <jiewen.yao@intel.com>
Mon, 23 May 2016 01:27:29 +0000 (09:27 +0800)
We updated gIntelFspPkgTokenSpaceGuid to gIntelFsp2PkgTokenSpaceGuid
in IntelFsp2Pkg, but we miss the update in IntelFsp2WrapperPkg.
This patch fixed the issue and made them consistent.

Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Cc: Satya P Yarlagadda <satya.p.yarlagadda@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Ravi P Rangarajan <ravi.p.rangarajan@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>
IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/BaseFspWrapperApiLib.inf
IntelFsp2WrapperPkg/Library/PeiFspWrapperHobProcessLibSample/PeiFspWrapperHobProcessLibSample.inf
IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecFspWrapperPlatformSecLibSample.inf

index 9d50922..d8af0aa 100644 (file)
@@ -60,7 +60,7 @@
   gFspHobGuid                                       ## CONSUMES ## HOB\r
 \r
 [Pcd]\r
-  gFspWrapperTokenSpaceGuid.PcdFspsBaseAddress              ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress  ## CONSUMES\r
 \r
 [Depex]\r
   TRUE\r
index df735e1..0901a14 100644 (file)
@@ -59,7 +59,7 @@
   IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec\r
 \r
 [Pcd]\r
-  gFspWrapperTokenSpaceGuid.PcdFspmBaseAddress                ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress  ## CONSUMES\r
 \r
 [Sources]\r
   FspmWrapperPeim.c\r
index 05914f3..261278f 100644 (file)
@@ -66,7 +66,7 @@
   gEfiPeiMemoryDiscoveredPpiGuid        ## PRODUCES\r
 \r
 [Pcd]\r
-  gFspWrapperTokenSpaceGuid.PcdFspsBaseAddress                ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress  ## CONSUMES\r
 \r
 [Guids]\r
   gFspHobGuid                           ## CONSUMES ## HOB\r
index b76e611..ac30e76 100644 (file)
@@ -36,7 +36,7 @@
   #\r
   # GUID defined in package\r
   #\r
-  gFspWrapperTokenSpaceGuid             = { 0xa34cf082, 0xf50, 0x4f0d,  { 0x89, 0x8a, 0x3d, 0x39, 0x30, 0x2b, 0xc5, 0x1e } }\r
+  gIntelFsp2WrapperTokenSpaceGuid       = { 0xa34cf082, 0xf50, 0x4f0d,  { 0x89, 0x8a, 0x3d, 0x39, 0x30, 0x2b, 0xc5, 0x1e } }\r
   gFspApiPerformanceGuid                = { 0xc9122295, 0x56ed, 0x4d4e, { 0x06, 0xa6, 0x50, 0x8d, 0x89, 0x4d, 0x3e, 0x40 } }\r
   gFspHobGuid                           = { 0x6d86fb36, 0xba90, 0x472c, { 0xb5, 0x83, 0x3f, 0xbe, 0xd3, 0xfb, 0x20, 0x9a } }\r
 \r
 ################################################################################\r
 [PcdsFixedAtBuild, PcdsPatchableInModule]\r
   ## Provides the memory mapped base address of the BIOS CodeCache Flash Device.\r
-  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFFE00000|UINT32|0x10000001\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFFE00000|UINT32|0x10000001\r
   ## Provides the size of the BIOS Flash Device.\r
-  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00200000|UINT32|0x10000002\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00200000|UINT32|0x10000002\r
 \r
   ## Indicates the base address of the first Microcode Patch in the Microcode Region\r
-  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0x0|UINT64|0x10000005\r
-  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x0|UINT64|0x10000006\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0x0|UINT64|0x10000005\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x0|UINT64|0x10000006\r
   ## Indicates the offset of the Cpu Microcode.\r
-  gFspWrapperTokenSpaceGuid.PcdFlashMicrocodeOffset|0x90|UINT32|0x10000007\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFlashMicrocodeOffset|0x90|UINT32|0x10000007\r
 \r
   ## Indicate the PEI memory size platform want to report\r
-  gFspWrapperTokenSpaceGuid.PcdPeiMinMemSize|0x1800000|UINT32|0x40000004\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdPeiMinMemSize|0x1800000|UINT32|0x40000004\r
   ## Indicate the PEI memory size platform want to report\r
-  gFspWrapperTokenSpaceGuid.PcdPeiRecoveryMinMemSize|0x3000000|UINT32|0x40000005\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdPeiRecoveryMinMemSize|0x3000000|UINT32|0x40000005\r
 \r
   ## This is the base address of FSP-T/M/S\r
-  gFspWrapperTokenSpaceGuid.PcdFsptBaseAddress|0x00000000|UINT32|0x00000300\r
-  gFspWrapperTokenSpaceGuid.PcdFspmBaseAddress|0x00000000|UINT32|0x00000301\r
-  gFspWrapperTokenSpaceGuid.PcdFspsBaseAddress|0x00000000|UINT32|0x00000302\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress|0x00000000|UINT32|0x00000300\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress|0x00000000|UINT32|0x00000301\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress|0x00000000|UINT32|0x00000302\r
index b1a9f38..870c3fb 100644 (file)
@@ -67,5 +67,5 @@
   gFspHeaderFileGuid            ## CONSUMES ## GUID\r
 \r
 [Pcd]\r
-  gFspWrapperTokenSpaceGuid.PcdFspmBaseAddress          ## CONSUMES\r
-  gFspWrapperTokenSpaceGuid.PcdFspsBaseAddress          ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress  ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress  ## CONSUMES\r
index 6fa91b6..7eb61dc 100644 (file)
@@ -64,8 +64,8 @@
   PeiServicesTablePointerLib\r
 \r
 [Pcd]\r
-  gFspWrapperTokenSpaceGuid.PcdPeiMinMemSize              ## CONSUMES\r
-  gFspWrapperTokenSpaceGuid.PcdPeiRecoveryMinMemSize      ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdPeiMinMemSize          ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdPeiRecoveryMinMemSize  ## CONSUMES\r
 \r
 [Guids]\r
   gFspReservedMemoryResourceHobGuid                       ## CONSUMES ## HOB\r
index 10df778..30393d2 100644 (file)
   gTopOfTemporaryRamPpiGuid               ## PRODUCES\r
 \r
 [Pcd]\r
-  gFspWrapperTokenSpaceGuid.PcdFsptBaseAddress                  ## CONSUMES\r
-  gFspWrapperTokenSpaceGuid.PcdFspmBaseAddress                  ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress              ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress              ## CONSUMES\r
 \r
 [FixedPcd]\r
-  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress         ## CONSUMES\r
-  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize      ## CONSUMES\r
-  gFspWrapperTokenSpaceGuid.PcdFlashMicrocodeOffset             ## CONSUMES\r
-  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress            ## CONSUMES\r
-  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize               ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress     ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize  ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFlashMicrocodeOffset         ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheAddress        ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize           ## CONSUMES\r