From: hhtian Date: Fri, 2 Sep 2011 13:30:38 +0000 (+0000) Subject: Resolve conflicted PCD TokenValue X-Git-Tag: edk2-stable201903~14285 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=6bea33367b7d074d5a7ac7b3acaa7027377c72f2 Resolve conflicted PCD TokenValue Signed-off-by: hhtian git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12268 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 55626812f2..8837cac700 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -735,7 +735,7 @@ ## The PCD is used to specify the stack size when capsule IA32 PEI transfers to long mode in PEI phase. # The default size 32K. When changing the value of this PCD, the platform developer should # make sure the memory size is large enough to meet capsule PEI requiremnt in capsule update path. - gEfiMdeModulePkgTokenSpaceGuid.PcdCapsulePeiLongModeStackSize|0x8000|UINT32|0x0001005C + gEfiMdeModulePkgTokenSpaceGuid.PcdCapsulePeiLongModeStackSize|0x8000|UINT32|0x0001005D [PcdsPatchableInModule] ## Specify memory size with page number for PEI code when