The following INF file:
- OvmfPkg/QuarkPort/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf

references a bunch of PCDs that used to belong to "gEfiCpuTokenSpaceGuid"
under Quark_EDKII_v1.1.0/IA32FamilyCpuBasePkg.

Add a new token space GUID, gQuarkPortCpuTokenSpaceGuid, to OvmfPkg.dec,
fresh from uuidgen, and point the INF file to it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <[email protected]>
---
 OvmfPkg/QuarkPort/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf | 32 ++++++++++----------
 OvmfPkg/OvmfPkg.dec                                 |  1 +
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/OvmfPkg/QuarkPort/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf 
b/OvmfPkg/QuarkPort/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
index 75f4151..5419849 100644
--- a/OvmfPkg/QuarkPort/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
+++ b/OvmfPkg/QuarkPort/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
@@ -129,26 +129,26 @@ [Guids]
   
 [FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmDebug
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmUncacheCpuSyncData
-  gEfiCpuTokenSpaceGuid.PcdCpuHotPlugSupport
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmStackGuard
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmProfileEnable  
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmProfileRingBuffer
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmFeatureControlMsrLock
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmDebug
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmUncacheCpuSyncData
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuHotPlugSupport
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmStackGuard
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmProfileEnable  
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmProfileRingBuffer
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmFeatureControlMsrLock
 
 [FixedPcd]
-  gEfiCpuTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmProfileSize
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmProfileSize
   
 [Pcd]
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmStackSize
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmApSyncTimeout
-  gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress
-  gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmCodeAccessCheckEnable
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmStackSize
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmApSyncTimeout
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuS3DataAddress
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress
+  gQuarkPortCpuTokenSpaceGuid.PcdCpuSmmCodeAccessCheckEnable
 
 [Depex]
   gEfiMpServiceProtocolGuid
diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
index 229fad4..e35adf7 100644
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -82,6 +82,7 @@ [Guids]
   gOvmfPlatformConfigGuid         = {0x7235c51c, 0x0c80, 0x4cab, {0x87, 0xac, 
0x3b, 0x08, 0x4a, 0x63, 0x04, 0xb1}}
   gVirtioMmioTransportGuid        = {0x837dca9e, 0xe874, 0x4d82, {0xb2, 0x9a, 
0x23, 0xfe, 0x0e, 0x23, 0xd1, 0xe2}}
   gXenBusRootDeviceGuid           = {0xa732241f, 0x383d, 0x4d9c, {0x8a, 0xe1, 
0x8e, 0x09, 0x83, 0x75, 0x89, 0xd7}}
+  gQuarkPortCpuTokenSpaceGuid     = {0xdaf01f4a, 0x8fa0, 0x4434, {0xbe, 0x40, 
0x22, 0x28, 0xa0, 0x80, 0xf7, 0x40}}
 
 [Protocols]
   gVirtioDeviceProtocolGuid       = {0xfa920010, 0x6785, 0x4941, {0xb6, 0xec, 
0x49, 0x8c, 0x57, 0x9f, 0x16, 0x0a}}
-- 
1.8.3.1


_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to