IntelFsp2WrapperPkg: Update gFspWrapperTokenSpaceGuid to gIntelFsp2WrapperTokenSpaceGuid.

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>

diff --git a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
index 9d50922547846d650f2f9bd9ff1ef3273093134f..d8af0aa50f73bc3a6ddc039f3af6344d06517283 100644 (file)
--- a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
+++ b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
@@ -60,7 +60,7 @@
   gFspHobGuid                                       ## CONSUMES ## HOB\r
 \r
 [Pcd]\r
   gFspHobGuid                                       ## CONSUMES ## HOB\r
 \r
 [Pcd]\r

-  gFspWrapperTokenSpaceGuid.PcdFspsBaseAddress              ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress  ## CONSUMES\r

 \r
 [Depex]\r
   TRUE\r
 \r
 [Depex]\r
   TRUE\r

diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
index df735e1065c5184fc06332047cf03f4ad8132f03..0901a1463b6695c842c585dd9a5413b93d39f9bb 100644 (file)
--- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
+++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
@@ -59,7 +59,7 @@
   IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec\r
 \r
 [Pcd]\r
   IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec\r
 \r
 [Pcd]\r

-  gFspWrapperTokenSpaceGuid.PcdFspmBaseAddress                ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress  ## CONSUMES\r

 \r
 [Sources]\r
   FspmWrapperPeim.c\r
 \r
 [Sources]\r
   FspmWrapperPeim.c\r

diff --git a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
index 05914f38495241426c845439b6ba49c7f3ec68ea..261278f564e8aa8f98f7b8c1e01373900c6fcfcb 100644 (file)
--- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
+++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
@@ -66,7 +66,7 @@
   gEfiPeiMemoryDiscoveredPpiGuid        ## PRODUCES\r
 \r
 [Pcd]\r
   gEfiPeiMemoryDiscoveredPpiGuid        ## PRODUCES\r
 \r
 [Pcd]\r

-  gFspWrapperTokenSpaceGuid.PcdFspsBaseAddress                ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress  ## CONSUMES\r

 \r
 [Guids]\r
   gFspHobGuid                           ## CONSUMES ## HOB\r
 \r
 [Guids]\r
   gFspHobGuid                           ## CONSUMES ## HOB\r

diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
index b76e611150ecad0e0488168be327366a8e17d4ed..ac30e76d2c6ecfc0733656cea4820d8a99a9b3a6 100644 (file)
--- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
+++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
@@ -36,7 +36,7 @@
   #\r
   # GUID defined in package\r
   #\r
   #\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
   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


@@ -56,22 +56,22 @@
 ################################################################################\r
 [PcdsFixedAtBuild, PcdsPatchableInModule]\r
   ## Provides the memory mapped base address of the BIOS CodeCache Flash Device.\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
   ## 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
 \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
   ## 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
 \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
   ## 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
 \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

diff --git a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/BaseFspWrapperApiLib.inf b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/BaseFspWrapperApiLib.inf
index b1a9f38f4ead3c11ec1ef0cfbcc733d89602844e..870c3fbee4be1027f778f32e9558cb4ff6fed3d3 100644 (file)
--- a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/BaseFspWrapperApiLib.inf
+++ b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/BaseFspWrapperApiLib.inf
@@ -67,5 +67,5 @@
   gFspHeaderFileGuid            ## CONSUMES ## GUID\r
 \r
 [Pcd]\r
   gFspHeaderFileGuid            ## CONSUMES ## GUID\r
 \r
 [Pcd]\r

-  gFspWrapperTokenSpaceGuid.PcdFspmBaseAddress          ## CONSUMES\r
-  gFspWrapperTokenSpaceGuid.PcdFspsBaseAddress          ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress  ## CONSUMES\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress  ## CONSUMES\r

diff --git a/IntelFsp2WrapperPkg/Library/PeiFspWrapperHobProcessLibSample/PeiFspWrapperHobProcessLibSample.inf b/IntelFsp2WrapperPkg/Library/PeiFspWrapperHobProcessLibSample/PeiFspWrapperHobProcessLibSample.inf
index 6fa91b664f027a2587ac4ede64dfbc9190ad1d91..7eb61dcf0c2ebea1c7547eb3e94b322a0f2c290c 100644 (file)
--- a/IntelFsp2WrapperPkg/Library/PeiFspWrapperHobProcessLibSample/PeiFspWrapperHobProcessLibSample.inf
+++ b/IntelFsp2WrapperPkg/Library/PeiFspWrapperHobProcessLibSample/PeiFspWrapperHobProcessLibSample.inf
@@ -64,8 +64,8 @@
   PeiServicesTablePointerLib\r
 \r
 [Pcd]\r
   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
 \r
 [Guids]\r
   gFspReservedMemoryResourceHobGuid                       ## CONSUMES ## HOB\r

diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecFspWrapperPlatformSecLibSample.inf b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecFspWrapperPlatformSecLibSample.inf
index 10df778df3f6e05cf329005eb6ef9d3cd11c5347..30393d28425256ba25a7a72ca187988c4200c2c4 100644 (file)
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecFspWrapperPlatformSecLibSample.inf
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecFspWrapperPlatformSecLibSample.inf
@@ -78,12 +78,12 @@
   gTopOfTemporaryRamPpiGuid               ## PRODUCES\r
 \r
 [Pcd]\r
   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
 \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