Roll back change to Terminal Type PCD

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

diff --git a/MdePkg/ChangeLog.txt b/MdePkg/ChangeLog.txt
index d1a1db5ee7c2d062384790284b47592c18c8fe91..ba0bed9759ea3b5e007629fd5561ff215d209080 100644 (file)
--- a/MdePkg/ChangeLog.txt
+++ b/MdePkg/ChangeLog.txt
@@ -237,10 +237,3 @@ Possible Impacts:
        EFI_TIMER_PERIOD_MICROSECONDS(X), EFI_TIMER_PERIOD_MILLISECONDS(X) and EFI_TIMER_PERIOD_SECONDS(X) for managing Timer Events.\r
        Especailly, EFI_SCSI_STALL_SECONDS(a) is simply replaced by EFI_TIMER_PERIOD_SECONDS(a)\r
 \r
-EDK_6857:  Non-Compatible: qwang12\r
-       \r
-       Rename PCD name of PcdDefaultTerminalType to PcdUartDefaultTerminalType based on Mde \r
-\r
-Possible Impacts:\r
-       All DSC files that reference PcdDefaultTerminalType.\r
-       \r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 7c17ca9d8c340219cb848ab010699dd80670633c..9ba9516118c2c6382c01075f0333ee5b6a783cbb 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -539,7 +539,7 @@
   \r
   ## Indicates the usable type of terminal\r
   # 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8\r
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultTerminalType|0|UINT8|0x00000024  \r
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x00000024  \r
   \r
   ## Status code value for indicating the handoff from Pei phase to Dxe phase\r
   # EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_CORE_PC_HANDOFF_TO_NEXT\r
@@ -610,7 +610,7 @@
 \r
   ## Indicates the usable type of terminal\r
   # 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8\r
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultTerminalType|0|UINT8|0x00000024\r
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x00000024\r
 \r
   ## Indicates the allowable maximum number in extract handler table\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10|UINT32|0x00000025\r
@@ -642,7 +642,7 @@
 \r
   ## Indicates the usable type of terminal\r
   # 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8\r
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultTerminalType|0|UINT8|0x00000024\r
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x00000024\r
   \r
   ## This value is used to set the base address of pci express hierarchy\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000|UINT64|0x0000000a\r