From 8cf2c0a7d7d92885619ab9668b04f923b3199300 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Thu, 7 Sep 2006 08:24:27 +0000 Subject: [PATCH] Change PcdDebugPrintErrorLevel PCD declare in msa as DYNAMIC, because this PCD type can be FIXED_AT_BUILD and PATCHABLE_IN_MODULE. Change Some WINNT PCDs type declared in EdkNt32Pkg.spd as DYNAMIC, because they is used in Nt32 emluator platform as DYNAMIC type. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1494 6f19259b-4bc3-4df7-8a09-765794883524 --- EdkModulePkg/EdkModulePkg.spd | 6 +-- .../EdkDxeDebugLibReportStatusCode.msa | 2 +- .../EdkUefiDebugLibConOut.msa | 2 +- .../EdkUefiDebugLibStdErr.msa | 2 +- EdkNt32Pkg/EdkNt32Pkg.spd | 53 +++++++++---------- EdkNt32Pkg/Nt32.fpd | 27 ---------- EdkNt32Pkg/Sec/SecMain.msa | 15 +++--- .../BaseDebugLibNull/BaseDebugLibNull.msa | 2 +- .../BasePciExpressLib/BasePciExpressLib.msa | 2 +- .../PeiDxeDebugLibReportStatusCode.msa | 2 +- .../UefiDebugLibConOut/UefiDebugLibConOut.msa | 2 +- .../UefiDebugLibStdErr/UefiDebugLibStdErr.msa | 2 +- MdePkg/MdePkg.spd | 2 +- 13 files changed, 43 insertions(+), 76 deletions(-) diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd index 6359d649e8..81109f8c7c 100644 --- a/EdkModulePkg/EdkModulePkg.spd +++ b/EdkModulePkg/EdkModulePkg.spd @@ -826,7 +826,7 @@ PcdSupportUpdateCapsuleRest - 0x00010020 + 0x0001001d gEfiEdkModulePkgTokenSpaceGuid BOOLEAN FEATURE_FLAG @@ -834,7 +834,7 @@ PcdMaxSizePopulateCapsule - 0x00010021 + 0x0001001e gEfiEdkModulePkgTokenSpaceGuid UINT32 FIXED_AT_BUILD @@ -842,7 +842,7 @@ PcdMaxSizeNonPopulateCapsule - 0x00010022 + 0x0001001f gEfiEdkModulePkgTokenSpaceGuid UINT32 FIXED_AT_BUILD diff --git a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa index 05b927d4bd..4b631eab42 100644 --- a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa +++ b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa @@ -89,7 +89,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. The value used by DebugClearMemory () to fill a certain range of memory. - + PcdDebugPrintErrorLevel gEfiMdePkgTokenSpaceGuid The bitmask of flags that specify the kind of debug message diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa index 93fa1d2705..a63524bb82 100644 --- a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa +++ b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa @@ -89,7 +89,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. The value used by DebugClearMemory () to fill a certain range of memory. - + PcdDebugPrintErrorLevel gEfiMdePkgTokenSpaceGuid The bitmask of flags that specify the kind of debug message diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa index 0991e9786b..89a9811f6d 100644 --- a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa +++ b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa @@ -89,7 +89,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. The value used by DebugClearMemory () to fill a certain range of memory. - + PcdDebugPrintErrorLevel gEfiMdePkgTokenSpaceGuid The bitmask of flags that specify the kind of debug message diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd index c3195ac337..d0998fe906 100644 --- a/EdkNt32Pkg/EdkNt32Pkg.spd +++ b/EdkNt32Pkg/EdkNt32Pkg.spd @@ -234,8 +234,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. DYNAMIC L"E:RW;245760;512" This PCD defines physical disk which will be simualted as a - harddisk in simulator. - The item type of this PCD can only be "DYNAMIC". + harddisk in simulator. The item type of this PCD can only be "DYNAMIC". PcdWinNtVirtualDisk @@ -245,8 +244,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. DYNAMIC L"FW;40960;512" This PCD defines the devices which use a file to emulate a hard disk or - removable media device - The item type if this PCD can only be "DYNAMIC". + removable media device.The item type of this PCD can only be "DYNAMIC". PcdWinNtSerialPort @@ -273,7 +271,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 0x00001004 gEfiEdkNt32PkgTokenSpaceGuid VOID* - FIXED_AT_BUILD + DYNAMIC L".!..\\..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps" This PCD defines the windows directory who will be mounted as harddisk in simulator. @@ -284,28 +282,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 0x00001005 gEfiEdkNt32PkgTokenSpaceGuid VOID* - FIXED_AT_BUILD - L"64!64" - This PCD defines the size of simulated memory size. - The item type of this PCD can only be "DYNAMIC". - - - PcdWinNtMemorySizeForSecMain - 0x00001005 - gEfiEdkNt32PkgTokenSpaceGuid - VOID* - FIXED_AT_BUILD + DYNAMIC L"64!64" This PCD defines the memory size of simulated machine. Simulator will allocate - the size of PcdWinNtMemorySizeForSecMain in windows platform. - The item type of this PCD can only be "FIXED_AT_BUILD". + the size of PcdWinNtMemorySize in windows platform. + The item type of this PCD can only be "DYNAMIC". PcdWinNtBootMode 0x00001006 gEfiEdkNt32PkgTokenSpaceGuid UINT32 - FIXED_AT_BUILD + FIXED_AT_BUILD PATCHABLE_IN_MODULE 1 This PCD defines the boot mode for simualtor. The boot mode can be set as following value: @@ -319,15 +307,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 0x10: Boot on S2 resume. 0x11: Boot on S3 resume. 0x12: Boot on flash update. - 0x20: Boot in reovery mode. - The item type of this PCD can only be "FIXED_AT_BUILD". + 0x20: Boot in reovery mode. PcdWinNtCpuModel 0x00001007 gEfiEdkNt32PkgTokenSpaceGuid VOID* - FIXED_AT_BUILD + DYNAMIC L"Intel(R) Processor Model" This PCD defines simulated CPU model string. The item type of this PCD can only be "DYNAMIC". @@ -337,26 +324,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 0x00001008 gEfiEdkNt32PkgTokenSpaceGuid VOID* - FIXED_AT_BUILD + DYNAMIC L"3000" - This PCD defines simulated CPU speed string. + This PCD defines simulated CPU speed string. + The item type of this PCD can only be "DYNAMIC". PcdWinNtFirmwareVolume 0x00001009 gEfiEdkNt32PkgTokenSpaceGuid VOID* - FIXED_AT_BUILD + FIXED_AT_BUILD PATCHABLE_IN_MODULE L"..\\..\\Fv\\Fv_Recovery.fd" - This PCD defines the FD file windows path string. Simulator will load the FD file and execute. - The item type of this PCD can only be "FIXED_AT_BUILD". + This PCD defines the FD file windows path string. Simulator will load the FD file and execute. PcdWinNtConsole 0x0000100a gEfiEdkNt32PkgTokenSpaceGuid VOID* - FIXED_AT_BUILD + DYNAMIC L"Bus Driver Console Window" This PCD declares the title string of the text console window. such as "My EFI Console". @@ -371,5 +358,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. FALSE Select which type of driver the library links against. + + PcdWinNtMemorySizeForSecMain + 0x0000100c + gEfiEdkNt32PkgTokenSpaceGuid + VOID* + FIXED_AT_BUILD PATCHABLE_IN_MODULE + L"64!64" + This PCD defines the memory size of simulated machine. Simulator will allocate + the size of PcdWinNtMemorySizeForSecMain in windows platform. + diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd index 32647a5fdc..8a62342c16 100644 --- a/EdkNt32Pkg/Nt32.fpd +++ b/EdkNt32Pkg/Nt32.fpd @@ -192,14 +192,6 @@ 4 1000000 - - PcdWinNtCpuModel - 0x00001007 - gEfiEdkNt32PkgTokenSpaceGuid - VOID* - 48 - L"Intel(R) Processor Model" - PcdWinNtFirmwareVolume 0x00001009 @@ -224,14 +216,6 @@ 1 0xAF - - PcdWinNtMemorySize - 0x00001005 - gEfiEdkNt32PkgTokenSpaceGuid - VOID* - 10 - L"64!64" - PcdWinNtMemorySizeForSecMain 0x00001005 @@ -7054,17 +7038,6 @@ L"UGA Window 1!UGA Window 2" - - PcdTestDynamicBoolean - 0x00011004 - gEfiEdkNt32PkgTokenSpaceGuid - BOOLEAN - 1 - - 0 - FALSE - - PcdWinNtCpuSpeed 0x00001008 diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa index 535d7351d3..705efcef7a 100644 --- a/EdkNt32Pkg/Sec/SecMain.msa +++ b/EdkNt32Pkg/Sec/SecMain.msa @@ -91,20 +91,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.--> EDK_RELEASE_VERSION 0x00020000 - + PcdWinNtMemorySizeForSecMain gEfiEdkNt32PkgTokenSpaceGuid This PCD defines the memory size of simulated machine. Simulator will allocate - the size of PcdWinNtMemorySizeForSecMain in windows platform. - The item type of this PCD can only be "FIXED_AT_BUILD". + the size of PcdWinNtMemorySizeForSecMain in windows platform. - + PcdWinNtFirmwareVolume gEfiEdkNt32PkgTokenSpaceGuid - This PCD defines the FD file windows path string. Simulator will load the FD file and execute. - The item type of this PCD can only be "FIXED_AT_BUILD". + This PCD defines the FD file windows path string. Simulator will load the FD file and execute. - + PcdWinNtBootMode gEfiEdkNt32PkgTokenSpaceGuid This PCD defines the boot mode for simualtor. @@ -119,8 +117,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.--> 0x10: Boot on S2 resume. 0x11: Boot on S3 resume. 0x12: Boot on flash update. - 0x20: Boot in reovery mode. - The item type of this PCD can only be "FIXED_AT_BUILD". + 0x20: Boot in reovery mode. \ No newline at end of file diff --git a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa index a71f9ac8ff..97678b4774 100644 --- a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa +++ b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa @@ -72,7 +72,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. The value used by DebugClearMemory () to fill a certain range of memory. - + PcdDebugPrintErrorLevel gEfiMdePkgTokenSpaceGuid The bitmask of flags that specify the kind of debug message diff --git a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa index 7996aeb86d..155a7276a5 100644 --- a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa +++ b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa @@ -57,7 +57,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. EDK_RELEASE_VERSION 0x00020000 - + PcdPciExpressBaseAddress gEfiMdePkgTokenSpaceGuid The base address of PCI Express MMIO window. diff --git a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa b/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa index c80705b97d..9b9c59ccc7 100644 --- a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa +++ b/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa @@ -77,7 +77,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. The value used by DebugClearMemory () to fill a certain range of memory. - + PcdDebugPrintErrorLevel gEfiMdePkgTokenSpaceGuid The bitmask of flags that specify the kind of debug message diff --git a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa index b85d4d5b4e..4f4541d8d1 100644 --- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa +++ b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa @@ -75,7 +75,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. The value used by DebugClearMemory () to fill a certain range of memory. - + PcdDebugPrintErrorLevel gEfiMdePkgTokenSpaceGuid The bitmask of flags that specify the kind of debug message diff --git a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa index ac16e2cc5f..9d7408b9e7 100644 --- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa +++ b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa @@ -75,7 +75,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. The value used by DebugClearMemory () to fill a certain range of memory. - + PcdDebugPrintErrorLevel gEfiMdePkgTokenSpaceGuid The bitmask of flags that specify the kind of debug message diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd index 89c1f2b2fc..3fbc1532ab 100644 --- a/MdePkg/MdePkg.spd +++ b/MdePkg/MdePkg.spd @@ -2285,7 +2285,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 0x00000006 gEfiMdePkgTokenSpaceGuid UINT32 - PATCHABLE_IN_MODULE + FIXED_AT_BUILD PATCHABLE_IN_MODULE 0x80000000 The bitmask of flags that specify the kind of debug message output when Debug Print is enabled. -- 2.39.2