summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhiguang Liu <zhiguang.liu@intel.com>2021-06-02 22:30:08 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-06-16 05:20:19 +0000
commitfa24b6ed2679ce238de312204ff516928c34e631 (patch)
tree49cbcc30a6caa250e902c4adc3c9b4b7ca0c8068
parent8c0d678063833a7b2b81462b78de3d8d70de9a5c (diff)
downloadedk2-fa24b6ed2679ce238de312204ff516928c34e631.tar.gz
edk2-fa24b6ed2679ce238de312204ff516928c34e631.tar.bz2
edk2-fa24b6ed2679ce238de312204ff516928c34e631.zip
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>
-rw-r--r--UefiPayloadPkg/UefiPayloadPkg.dsc7
1 files changed, 5 insertions, 2 deletions
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index e9211adf86..21b360256b 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -335,11 +335,11 @@
################################################################################
#
-# Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform
+# Pcd DynamicEx Section - list of all EDK II PCD Entries defined by this Platform
#
################################################################################
-[PcdsDynamicDefault]
+[PcdsDynamicExDefault]
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
@@ -362,6 +362,9 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed|FALSE
+ gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE
################################################################################