From 12e266f8208844a19623d30228d1584f9af29a25 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Thu, 14 Apr 2011 02:11:59 +0000 Subject: sync patch r10994, r10995, r10996 from main trunk. Fix PCD token value conflict issue. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010@11540 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/MdeModulePkg.dec | 4 ++-- MdePkg/MdePkg.dec | 2 +- OvmfPkg/OvmfPkg.dec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 812b6228fd..6bfca844f3 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -265,7 +265,7 @@ ## This PCD specifies whether the PCI bus driver probes non-standard, # such as 2K/1K/512, granularity for PCI to PCI bridge I/O window. - gEfiMdeModulePkgTokenSpaceGuid.PcdPciBridgeIoAlignmentProbe|FALSE|BOOLEAN|0x10000047 + gEfiMdeModulePkgTokenSpaceGuid.PcdPciBridgeIoAlignmentProbe|FALSE|BOOLEAN|0x0001004e ## This PCD specifies whether StatusCode is reported via Serial port. gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x00010022 @@ -429,7 +429,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule|0xa00000|UINT32|0x0001001f ## Null-terminated Unicode string of the firmware vendor name that is default name filled into the EFI System Table - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"EDK II"|VOID*|0xx00010050 + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"EDK II"|VOID*|0x00010050 ## Firmware revision that is default value filled into the EFI System Table gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision|0x00010000|UINT32|0x00010051 diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index e0e8bde952..d2857b4e68 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -1109,7 +1109,7 @@ gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE|BOOLEAN|0x0000000e ## If TRUE, the component name2 protocol will not be installed. - gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE|BOOLEAN|0x000000010 + gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE|BOOLEAN|0x00000010 ## If TRUE, the driver diagnostics2 protocol will not be installed. gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE|BOOLEAN|0x00000011 diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index c9d3ef7779..37da59f124 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -30,10 +30,10 @@ [PcdsFixedAtBuild] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase|0x0|UINT32|0 - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize|0x0|UINT32|0 + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize|0x0|UINT32|1 [PcdsDynamic] - gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent|0|UINT64|0 + gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent|0|UINT64|2 [LibraryClasses] ## @libraryclass Save and restore variables using a file -- cgit