2 files changed, 3 insertions, 10 deletions
diff --git a/MdePkg/ChangeLog.txt b/MdePkg/ChangeLog.txt
index d1a1db5..ba0bed9 100644
--- 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.
 	Especailly, EFI_SCSI_STALL_SECONDS(a) is simply replaced by EFI_TIMER_PERIOD_SECONDS(a)
 
-EDK_6857:  Non-Compatible: qwang12
-	
-	Rename PCD name of PcdDefaultTerminalType to PcdUartDefaultTerminalType based on Mde 
-
-Possible Impacts:
-	All DSC files that reference PcdDefaultTerminalType.
-	
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 7c17ca9..9ba9516 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -539,7 +539,7 @@
   
   ## Indicates the usable type of terminal
   # 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultTerminalType|0|UINT8|0x00000024  
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x00000024  
   
   ## Status code value for indicating the handoff from Pei phase to Dxe phase
   # EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_CORE_PC_HANDOFF_TO_NEXT
@@ -610,7 +610,7 @@
 
   ## Indicates the usable type of terminal
   # 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultTerminalType|0|UINT8|0x00000024
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x00000024
 
   ## Indicates the allowable maximum number in extract handler table
   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10|UINT32|0x00000025
@@ -642,7 +642,7 @@
 
   ## Indicates the usable type of terminal
   # 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultTerminalType|0|UINT8|0x00000024
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x00000024
   
   ## This value is used to set the base address of pci express hierarchy
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000|UINT64|0x0000000a