diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 101b3576c4..1866bd7175 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
dummy.fdf
-
+
@@ -173,6 +173,143 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
PE32_PEIM
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PcdMaximumUnicodeStringLength
+ 0x00000001
+ gEfiMdePkgTokenSpaceGuid
+ UINT32
+ 4
+ 1000000
+
+
+ PcdMaximumAsciiStringLength
+ 0x00000002
+ gEfiMdePkgTokenSpaceGuid
+ UINT32
+ 4
+ 1000000
+
+
+ PcdDebugPropertyMask
+ 0x00000005
+ gEfiMdePkgTokenSpaceGuid
+ UINT8
+ 1
+ 0x0f
+
+
+ PcdSpinLockTimeout
+ 0x00000004
+ gEfiMdePkgTokenSpaceGuid
+ UINT32
+ 4
+ 10000000
+
+
+ PcdDebugPrintErrorLevel
+ 0x00000006
+ gEfiMdePkgTokenSpaceGuid
+ UINT32
+ 4
+ 0x80000000
+
+
+ PcdMaximumLinkedListLength
+ 0x00000003
+ gEfiMdePkgTokenSpaceGuid
+ UINT32
+ 4
+ 1000000
+
+
+ PcdReportStatusCodePropertyMask
+ 0x00000007
+ gEfiMdePkgTokenSpaceGuid
+ UINT8
+ 1
+ 0x07
+
+
+ PcdDebugClearMemoryValue
+ 0x00000008
+ gEfiMdePkgTokenSpaceGuid
+ UINT8
+ 1
+ 0xAF
+
+
+ PcdVpdBaseAddress
+ 0x00010010
+ gEfiEdkModulePkgTokenSpaceGuid
+ UINT32
+ 4
+ 0x0
+
+
+ PcdDxePcdDatabaseTraverseEnabled
+ 0x00010021
+ gEfiEdkModulePkgTokenSpaceGuid
+ BOOLEAN
+ 1
+ TRUE
+
+
+ PcdStatusCodeUseSerial
+ 0x00010022
+ gEfiEdkModulePkgTokenSpaceGuid
+ BOOLEAN
+ 1
+ FALSE
+
+
+ PcdStatusCodeUseMemory
+ 0x00010023
+ gEfiEdkModulePkgTokenSpaceGuid
+ BOOLEAN
+ 1
+ FALSE
+
+
+ PcdStatusCodeUseOEM
+ 0x00010024
+ gEfiEdkModulePkgTokenSpaceGuid
+ BOOLEAN
+ 1
+ FALSE
+
+
+ PcdStatusCodeMemorySize
+ 0x00010025
+ gEfiEdkModulePkgTokenSpaceGuid
+ UINT16
+ 2
+ 1
+
+
+
+ FV_RECOVERY
+ PE32_PEIM
+
+
+
diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
index 7a11c0e1a8..abada2c5d0 100644
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
@@ -60,6 +60,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Common/RuntimeService.c
Common/RuntimeLib.c
Common/RuntimeService.c
+ Common/RuntimeLib.c
+ Common/RuntimeService.c
Ipf/RuntimeLib.c
Ipf/RuntimeService.c