UefiPayloadPkg: Use DynamicEx instead of Dynamic to pass PCD across binary

When passing PCD database from Edk2 boot loader to Universal Payload, the
local token number in boot loader PCD database can be different with that
in Payload PCD database.
Dynamic PCD directly use local token number, while DynamicEx will search
token number by Guid and ExTokenNumber, which are unique pair and can make
sure finding the correct token number in boot loader's PCD database.
Therefore, using DynamicEx instead of Dynamic.
Also, explicitly define some PCDs as DynamicEx, or their default type will
be Dynamic

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index e9211adf86e582807773dca436384836e4955951..21b360256bf8ad583a8609f0008b3e3ba2e32c71 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -335,11 +335,11 @@
 \r
 ################################################################################\r
 #\r
-# Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform\r
+# Pcd DynamicEx Section - list of all EDK II PCD Entries defined by this Platform\r
 #\r
 ################################################################################\r
 \r
-[PcdsDynamicDefault]\r
+[PcdsDynamicExDefault]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0\r
@@ -362,6 +362,9 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize|0\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase|0\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed|FALSE\r
+  gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE\r
 \r
 ################################################################################\r