Update all INF, DEC and DSC file to confirm to newest INF spec 0.44, DEC spec 0.41, DSC spec 0.40.

Mainly PCD syntax update.
Check in new build.exe and GenFds.exe
Check in PcdSyntaxUpdate.exe tool. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3744 6f19259b-4bc3-4df7-8a09-765794883524

12 files changed, 210 insertions, 210 deletions

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
index 2779701d97..da623bc07b 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
@@ -63,9 +63,9 @@
   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED

   gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED

 

-[PcdsDynamic.common]

-  PcdWinNtCpuSpeed|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtCpuModel|gEfiNt32PkgTokenSpaceGuid

+[Pcd.common]

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel

 

 [Depex]

   gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf b/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
index 314b22507f..825fb5fca3 100644
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
@@ -67,21 +67,21 @@
   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_PRODUCED

   gEfiDevicePathProtocolGuid                    # PROTOCOL SOMETIMES_PRODUCED

 

-[PcdsFixedAtBuild.common]

-  PcdWinNtFirmwareFdSize|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFirmwareBlockSize|gEfiNt32PkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareBlockSize

 

-  PcdWinNtFlashFvRecoveryBase|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFlashFvRecoverySize|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFlashNvStorageEventLogSize|gEfiNt32PkgTokenSpaceGuid

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize

 

-  PcdFlashNvStorageFtwWorkingSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageFtwSpareSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase

 

 [depex]

   TRUE
\ No newline at end of file
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
index 601ec4b6d1..085aee1cd1 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
@@ -85,5 +85,5 @@
   gEfiFirmwareVolumeProtocolGuid                # PROTOCOL SOMETIMES_CONSUMED

   gEfiLoadedImageProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED

 

-[PcdsFixedAtBuild.common]

-  PcdUefiVariableDefaultTimeout|gEfiMdePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultTimeout

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
index a90cd33837..b0ccb41642 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
@@ -86,8 +86,8 @@
   gEfiHiiProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED

   gEfiDataHubProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED

 

-[PcdsDynamic.common]

-  PcdWinNtMemorySize|gEfiNt32PkgTokenSpaceGuid

+[Pcd.common]

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize

 

 [Depex]

   gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid

diff --git a/Nt32Pkg/Nt32Pkg.dec b/Nt32Pkg/Nt32Pkg.dec
index ef4ac5f34b..2af32e509b 100644
--- a/Nt32Pkg/Nt32Pkg.dec
+++ b/Nt32Pkg/Nt32Pkg.dec
@@ -101,35 +101,35 @@
 ################################################################################

 

 [PcdsFixedAtBuild.common]

-  PcdWinNtBootMode|0x00001006|gEfiNt32PkgTokenSpaceGuid|UINT32|1

-  PcdWinNtFirmwareVolume|0x00001009|gEfiNt32PkgTokenSpaceGuid|VOID*|L"..\\Fv\\Fv_Recovery.fd"

-  PcdWinNtMemorySizeForSecMain|0x0000100c|gEfiNt32PkgTokenSpaceGuid|VOID*|L"64!64"

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode|1|UINT32|0x00001006

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|0x00001009

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain|L"64!64"|VOID*|0x0000100c

 

-  PcdWinNtFlashNvStorageEventLogBase|0x0000100e|gEfiNt32PkgTokenSpaceGuid|UINT32|0x0

-  PcdWinNtFlashNvStorageEventLogSize|0x0000100f|gEfiNt32PkgTokenSpaceGuid|UINT32|0x0

-  PcdWinNtFlashFvRecoveryBase|0x00001010|gEfiNt32PkgTokenSpaceGuid|UINT32|0x0

-  PcdWinNtFlashFvRecoverySize|0x00001011|gEfiNt32PkgTokenSpaceGuid|UINT32|0x0

-  PcdWinNtFirmwareFdSize|0x00001012|gEfiNt32PkgTokenSpaceGuid|UINT32|0x0

-  PcdWinNtFirmwareBlockSize|0x00001013|gEfiNt32PkgTokenSpaceGuid|UINT32|0

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|0x0|UINT32|0x0000100e

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize|0x0|UINT32|0x0000100f

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase|0x0|UINT32|0x00001010

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize|0x0|UINT32|0x00001011

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize|0x0|UINT32|0x00001012

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareBlockSize|0|UINT32|0x00001013

 

-  PcdWinNtFlashNvStorageVariableBase|0x00001014|gEfiNt32PkgTokenSpaceGuid|UINT32|0x0

-  PcdWinNtFlashNvStorageFtwSpareBase|0x00001015|gEfiNt32PkgTokenSpaceGuid|UINT32|0x0

-  PcdWinNtFlashNvStorageFtwWorkingBase|0x00001016|gEfiNt32PkgTokenSpaceGuid|UINT32|0x0

-  PcdWinNtFdBaseAddress|0x00001017|gEfiNt32PkgTokenSpaceGuid|UINT32|0x0

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|0x0|UINT32|0x00001014

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|0x0|UINT32|0x00001015

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|0x0|UINT32|0x00001016

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFdBaseAddress|0x0|UINT32|0x00001017

 

 [PcdsDynamic.common]

-  PcdWinNtPhysicalDisk|0x00001000|gEfiNt32PkgTokenSpaceGuid|VOID*|L"E:RW;245760;512"

-  PcdWinNtVirtualDisk|0x00001001|gEfiNt32PkgTokenSpaceGuid|VOID*|L"FW;40960;512"

-  PcdWinNtSerialPort|0x00001002|gEfiNt32PkgTokenSpaceGuid|VOID*|L"COM1!COM2"

-  PcdWinNtUga|0x00001003|gEfiNt32PkgTokenSpaceGuid|VOID*|L"UGA Window 1!UGA Window 2"

-  PcdWinNtFileSystem|0x00001004|gEfiNt32PkgTokenSpaceGuid|VOID*|L".!..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"

-  PcdWinNtMemorySize|0x00001005|gEfiNt32PkgTokenSpaceGuid|VOID*|L"64!64"

-  PcdWinNtCpuModel|0x00001007|gEfiNt32PkgTokenSpaceGuid|VOID*|L"Intel(R) Processor Model"

-  PcdWinNtCpuSpeed|0x00001008|gEfiNt32PkgTokenSpaceGuid|VOID*|L"3000"

-  PcdWinNtConsole|0x0000100a|gEfiNt32PkgTokenSpaceGuid|VOID*|L"Bus Driver Console Window"

-  PcdWinNtGop|0x0000100d|gEfiNt32PkgTokenSpaceGuid|VOID*|L"UGA Window 1!UGA Window 2"

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtPhysicalDisk|L"E:RW;245760;512"|VOID*|0x00001000

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk|L"FW;40960;512"|VOID*|0x00001001

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtSerialPort|L"COM1!COM2"|VOID*|0x00001002

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga|L"UGA|VOID*|0x00001003 Window 1!UGA Window 2"

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"|VOID*|0x00001004

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize|L"64!64"|VOID*|0x00001005

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel|L"Intel(R)|VOID*|0x00001007 Processor Model"

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed|L"3000"|VOID*|0x00001008

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus|VOID*|0x0000100a Driver Console Window"

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA|VOID*|0x0000100d Window 1!UGA Window 2"

 

 [PcdsPatchableInModule.common]

-  PcdWinNtBootMode|0x00001006|gEfiNt32PkgTokenSpaceGuid|UINT32|1

-  PcdWinNtFirmwareVolume|0x00001009|gEfiNt32PkgTokenSpaceGuid|VOID*|L"..\\Fv\\Fv_Recovery.fd"

-  PcdWinNtMemorySizeForSecMain|0x0000100c|gEfiNt32PkgTokenSpaceGuid|VOID*|L"64!64"

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode|1|UINT32|0x00001006

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|0x00001009

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain|L"64!64"|VOID*|0x0000100c

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 37f7fe1729..f305080548 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -225,110 +225,110 @@
 ################################################################################

 

 [PcdsFeatureFlag.common]

-  PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdDxeIplSupportCustomDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplBuildShareCodeHobs|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplSupportEfiDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplSupportTianoDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplSupportCustomDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdUefiVariableDefaultLangDepricate|gEfiMdePkgTokenSpaceGuid|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildShareCodeHobs|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportEfiDecompress|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportTianoDecompress|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDepricate|FALSE

 

 [PcdsFixedAtBuild.IA32]

-  PcdStatusCodeMemorySize|gEfiIntelFrameworkModulePkgTokenSpaceGuid|1

-  PcdStatusCodeRuntimeMemorySize|gEfiIntelFrameworkModulePkgTokenSpaceGuid|128

-  PcdWinNtMemorySizeForSecMain|gEfiNt32PkgTokenSpaceGuid|L"64!64"|12

-  PcdWinNtFirmwareVolume|gEfiNt32PkgTokenSpaceGuid|L"..\\Fv\\Fv_Recovery.fd"|52

-  PcdWinNtBootMode|gEfiNt32PkgTokenSpaceGuid|1

-  PcdMaximumUnicodeStringLength|gEfiMdePkgTokenSpaceGuid|1000000

-  PcdMaximumAsciiStringLength|gEfiMdePkgTokenSpaceGuid|1000000

-  PcdMaximumLinkedListLength|gEfiMdePkgTokenSpaceGuid|1000000

-  PcdSpinLockTimeout|gEfiMdePkgTokenSpaceGuid|10000000

-  PcdMaximumAsciiStringLength|gEfiMdePkgTokenSpaceGuid|1000000

-  PcdMaximumLinkedListLength|gEfiMdePkgTokenSpaceGuid|1000000

-  PcdSpinLockTimeout|gEfiMdePkgTokenSpaceGuid|10000000

-  PcdReportStatusCodePropertyMask|gEfiMdePkgTokenSpaceGuid|0x0f

-  PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid|0x1f

-  PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid|0xAF

-  PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid|0x80000040

-  PcdPerformanceLibraryPropertyMask|gEfiMdePkgTokenSpaceGuid|0

-  PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiMdeModulePkgTokenSpaceGuid|0x08

-  PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdMaxSizeNonPopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdMaxSizePopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdPciIncompatibleDeviceSupportMask|gEfiIntelFrameworkModulePkgTokenSpaceGuid|0

-  PcdStatusCodeValueUncorrectableMemoryError|gEfiMdePkgTokenSpaceGuid|0x0005100   # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE3

-  PcdStatusCodeValueRemoteConsoleError|gEfiMdePkgTokenSpaceGuid|0x01040006        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR

-  PcdStatusCodeValueRemoteConsoleReset|gEfiMdePkgTokenSpaceGuid|0x01040001        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET

-  PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR

-  PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR

-  PcdUefiVariableDefaultTimeout|gEfiMdePkgTokenSpaceGuid|0x0008

-  PcdUefiVariableDefaultLangCodes|gEfiMdePkgTokenSpaceGuid|"engfra"|7

-  PcdUefiVariableDefaultLang|gEfiMdePkgTokenSpaceGuid|"eng"|4

-  PcdUefiVariableDefaultPlatformLangCodes|gEfiMdePkgTokenSpaceGuid|"en;fr"|6

-  PcdUefiVariableDefaultPlatformLang|gEfiMdePkgTokenSpaceGuid|"en"|3

-  PcdStatusCodeValueEfiWatchDogTimerExpired|gEfiMdePkgTokenSpaceGuid|0x00011003

-  PcdStatusCodeValueMemoryTestStarted|gEfiMdePkgTokenSpaceGuid|0x00051006

-  PcdStatusCodeValueSetVirtualAddressMap|gEfiMdePkgTokenSpaceGuid|0x03101004

-  PcdStatusCodeValueUncorrectableMemoryError|gEfiMdePkgTokenSpaceGuid|0x00051003

-  PcdUefiLibMaxPrintBufferSize|gEfiMdePkgTokenSpaceGuid|320

-  PcdUartDefaultBaudRate|gEfiMdePkgTokenSpaceGuid|115200

-  PcdUartDefaultDataBits|gEfiMdePkgTokenSpaceGuid|8

-  PcdUartDefaultParity|gEfiMdePkgTokenSpaceGuid|1

-  PcdUartDefaultStopBits|gEfiMdePkgTokenSpaceGuid|1

-  PcdDefaultTerminalType|gEfiMdePkgTokenSpaceGuid|0

-

-  PcdWinNtFirmwareFdSize|gEfiNt32PkgTokenSpaceGuid|0x2a0000

-  PcdWinNtFirmwareBlockSize|gEfiNt32PkgTokenSpaceGuid|0x10000

-  PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpaceGuid|0x28c000

-  PcdWinNtFlashNvStorageEventLogSize|gEfiNt32PkgTokenSpaceGuid|0x2000

-  PcdWinNtFlashFvRecoveryBase|gEfiNt32PkgTokenSpaceGuid|0x0

-  PcdWinNtFlashFvRecoverySize|gEfiNt32PkgTokenSpaceGuid|0x280000

-

-  PcdWinNtFlashNvStorageVariableBase|gEfiNt32PkgTokenSpaceGuid|0x280000

-  PcdWinNtFlashNvStorageFtwSpareBase|gEfiNt32PkgTokenSpaceGuid|0x290000

-  PcdWinNtFlashNvStorageFtwWorkingBase|gEfiNt32PkgTokenSpaceGuid|0x28e000

-

-  PcdFlashNvStorageFtwSpareSize|gEfiMdeModulePkgTokenSpaceGuid|0x10000

-  PcdFlashNvStorageFtwWorkingSize|gEfiMdeModulePkgTokenSpaceGuid|0x2000

-  PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid|0x00c000

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain|L"64!64"|VOID*|12

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|52

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode|1

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000

+  gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000

+  gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000

+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0f

+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x1f

+  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue|0xAF

+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000040

+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry|0x08

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule|0x0

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIncompatibleDeviceSupportMask|0

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueUncorrectableMemoryError|0x0005100   # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE3

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleError|0x01040006        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleReset|0x01040001        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleInputError|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleOutputError|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultTimeout|0x0008

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangCodes|"engfra"|VOID*|7

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang|"eng"|VOID*|4

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes|"en;fr"|VOID*|6

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang|"en"|VOID*|3

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueEfiWatchDogTimerExpired|0x00011003

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMemoryTestStarted|0x00051006

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueSetVirtualAddressMap|0x03101004

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueUncorrectableMemoryError|0x00051003

+  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1

+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0

+

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize|0x2a0000

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareBlockSize|0x10000

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|0x28c000

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize|0x2000

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase|0x0

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize|0x280000

+

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|0x280000

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|0x290000

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|0x28e000

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x10000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x2000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00c000

 

 [PcdsFeatureFlag.IA32]

-  PcdPeiPcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdPeiPcdDatabaseExEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdPeiPcdDatabaseGetSizeEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdPeiPcdDatabaseSetEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdStatusCodeUseSerial|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdStatusCodeUseMemory|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdStatusCodeUseOEM|gEfiIntelFrameworkModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplSwitchToLongMode|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdDxeIplSupportEfiDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplSupportTianoDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplSupportCustomDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplBuildShareCodeHobs|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxePcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdStatusCodeUseHardSerial|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdStatusCodeUseEfiSerial|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdStatusCodeUseRuntimeMemory|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdStatusCodeUseDataHub|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdStatusCodeUseOEM|gEfiIntelFrameworkModulePkgTokenSpaceGuid|TRUE

-  PcdStatusCodeReplayInSerial|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdStatusCodeReplayInDataHub|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdStatusCodeReplayInRuntimeMemory|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdStatusCodeReplayInOEM|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdSupportUpdateCapsuleRest|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdComponentNameDisable|gEfiMdePkgTokenSpaceGuid|FALSE

-  PcdDriverDiagnosticsDisable|gEfiMdePkgTokenSpaceGuid|FALSE

-  PcdNtEmulatorEnable|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdComponentName2Disable|gEfiMdePkgTokenSpaceGuid|TRUE

-  PcdDriverDiagnostics2Disable|gEfiMdePkgTokenSpaceGuid|TRUE

-  PcdSupportUpdateCapsuleRest|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdPciIsaEnable|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdPciVgaEnable|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE

-  PcdPciBusHotplugDeviceSupport|gEfiIntelFrameworkModulePkgTokenSpaceGuid|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled|TRUE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportEfiDecompress|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportTianoDecompress|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildShareCodeHobs|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleRest|FALSE

+  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE

+  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|TRUE

+  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE

+  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleRest|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIsaEnable|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciVgaEnable|FALSE

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport|TRUE

 

 

 

@@ -339,20 +339,20 @@
 ################################################################################

 

 [PcdsDynamicDefault.common.DEFAULT]

-  PcdWinNtSerialPort|gEfiNt32PkgTokenSpaceGuid|L"COM1!COM2"|18

-  PcdWinNtFileSystem|gEfiNt32PkgTokenSpaceGuid|L".!..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"|106

-  PcdWinNtGop|gEfiNt32PkgTokenSpaceGuid|L"UGA Window 1!UGA Window 2"|50

-  PcdWinNtConsole|gEfiNt32PkgTokenSpaceGuid|L"Bus Driver Console Window"|50

-  PcdWinNtVirtualDisk|gEfiNt32PkgTokenSpaceGuid|L"FW;40960;512"|24

-  PcdWinNtCpuModel|gEfiNt32PkgTokenSpaceGuid|L"NT32 Processor Emulation"|52

-  PcdWinNtCpuSpeed|gEfiNt32PkgTokenSpaceGuid|L"1234"|8

-  PcdWinNtMemorySize|gEfiNt32PkgTokenSpaceGuid|L"64!64"|10

-  PcdWinNtPhysicalDisk|gEfiNt32PkgTokenSpaceGuid|L"a:RW;2880;512!d:RO;307200;2048!j:RW;262144;512"|100

-  PcdWinNtUga|gEfiNt32PkgTokenSpaceGuid|L"UGA Window 1!UGA Window 2"|50

-

-  PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid|0

-  PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid|0

-  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid|0

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtSerialPort|L"COM1!COM2"|VOID*|18

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"|VOID*|106

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA Window 1!UGA Window 2"|VOID*|50

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus Driver Console Window"|VOID*|50

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk|L"FW;40960;512"|VOID*|24

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel|L"NT32 Processor Emulation"|VOID*|52

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed|L"1234"|VOID*|8

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize|L"64!64"|VOID*|10

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtPhysicalDisk|L"a:RW;2880;512!d:RO;307200;2048!j:RW;262144;512"|VOID*|100

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga|L"UGA Window 1!UGA Window 2"|VOID*|50

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0

 

 ################################################################################

 #

@@ -371,7 +371,7 @@
   ##

   MdeModulePkg/Core/Pei/PeiMain.inf

   MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {

-   <LibraryClass>

+   <LibraryClasses>

       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   }

   IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf

@@ -389,7 +389,7 @@
   ##

   MdeModulePkg/Core/Dxe/DxeMain.inf

   MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {

-    <LibraryClass>

+    <LibraryClasses>

       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   }

   Nt32Pkg/MetronomeDxe/MetronomeDxe.inf

diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf b/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf
index 40785d981c..0e359b8ac6 100644
--- a/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf
@@ -135,14 +135,14 @@
   gEfiLegacyBiosProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

   gEfiBdsArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED

 

-[PcdsFeatureFlag.common]

-  PcdUefiVariableDefaultLangDepricate|gEfiMdePkgTokenSpaceGuid|

+[FeaturePcd.common]

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDepricate|

 

-[PcdsFixedAtBuild.common]

-  PcdUefiVariableDefaultLangCodes|gEfiMdePkgTokenSpaceGuid

-  PcdUefiVariableDefaultLang|gEfiMdePkgTokenSpaceGuid

-  PcdUefiVariableDefaultPlatformLangCodes|gEfiMdePkgTokenSpaceGuid

-  PcdUefiVariableDefaultPlatformLang|gEfiMdePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangCodes

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes

+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang

 

 [depex]

   gEfiHiiProtocolGuid

diff --git a/Nt32Pkg/Sec/SecMain.inf b/Nt32Pkg/Sec/SecMain.inf
index 4e6a6a5eb6..db891436e2 100644
--- a/Nt32Pkg/Sec/SecMain.inf
+++ b/Nt32Pkg/Sec/SecMain.inf
@@ -60,13 +60,13 @@
   gPeiNtThunkPpiGuid                            # PPI ALWAYS_PRODUCED

 

 

-[PcdsFixedAtBuild.common]

-  PcdWinNtBootMode|gEfiNt32PkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode

 

   

-[PcdsDynamic.common]

-  #PcdWinNtMemorySizeForSecMain|gEfiNt32PkgTokenSpaceGuid

-  #PcdWinNtFirmwareVolume|gEfiNt32PkgTokenSpaceGuid

+[Pcd.common]

+  #gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain

+  #gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareVolume

   

 [BuildOptions.common]

   MSFT:DEBUG_*_IA32_DLINK_FLAGS = /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
index 8c94849827..ae7d2f7c8e 100644
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
@@ -75,15 +75,15 @@
   gEfiWinNtIoProtocolGuid                       # PROTOCOL BY_START

 

 

-[PcdsDynamic.common]

-  PcdWinNtMemorySize|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtCpuSpeed|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtCpuModel|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtPhysicalDisk|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtVirtualDisk|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFileSystem|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtSerialPort|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtGop|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtUga|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtConsole|gEfiNt32PkgTokenSpaceGuid

+[Pcd.common]

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtPhysicalDisk

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtSerialPort

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole

 

diff --git a/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf b/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
index a15bdbbb2b..3bcb96b972 100644
--- a/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
+++ b/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
@@ -50,16 +50,16 @@
   gNtFwhPpiGuid                                 # PPI ALWAYS_CONSUMED

 

 

-[PcdsFixedAtBuild.common]

-  PcdWinNtFlashFvRecoveryBase|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFlashFvRecoverySize|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFlashNvStorageEventLogSize|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFlashNvStorageVariableBase|gEfiNt32PkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase

 

-  PcdFlashNvStorageFtwWorkingSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageFtwSpareSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

 

 [depex]

   gNtFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid
\ No newline at end of file
diff --git a/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf b/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
index 785c59f1f3..b5cc4e5a6f 100644
--- a/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
+++ b/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
@@ -62,15 +62,15 @@
   gPeiFlashMapPpiGuid                           # PPI ALWAYS_PRODUCED

 

 

-[PcdsDynamic.common]

-  PcdFlashNvStorageFtwWorkingSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageFtwSpareSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid

-

-  PcdWinNtFlashNvStorageFtwWorkingBase|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFlashNvStorageFtwSpareBase|gEfiNt32PkgTokenSpaceGuid

-  PcdWinNtFlashNvStorageVariableBase|gEfiNt32PkgTokenSpaceGuid

+[Pcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase

+

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase

 

diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf
index 9638baa57d..7bc260c429 100644
--- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf
+++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf
@@ -66,9 +66,9 @@
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START

   gEfiWinNtIoProtocolGuid                       # PROTOCOL TO_START

 

-[PcdsFixedAtBuild.common]

-  PcdUartDefaultBaudRate|gEfiMdePkgTokenSpaceGuid|115200

-  PcdUartDefaultDataBits|gEfiMdePkgTokenSpaceGuid|8

-  PcdUartDefaultParity|gEfiMdePkgTokenSpaceGuid|1

-  PcdUartDefaultStopBits|gEfiMdePkgTokenSpaceGuid|1

+[FixedPcd.common]

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1