diff --git a/MdeModulePkg/Logo/Logo.bmp b/MdeModulePkg/Logo/Logo.bmp
index 3e85229e17..7cf0039cfd 100644
Binary files a/MdeModulePkg/Logo/Logo.bmp and b/MdeModulePkg/Logo/Logo.bmp differ
diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dec b/PcAtChipsetPkg/PcAtChipsetPkg.dec
index a53ca777e8..952f57ab2b 100644
--- a/PcAtChipsetPkg/PcAtChipsetPkg.dec
+++ b/PcAtChipsetPkg/PcAtChipsetPkg.dec
@@ -47,7 +47,7 @@
   #   TRUE  - RTC port registers are in MMIO space.<BR>
   #   FALSE - RTC port registers are in I/O space.<BR>
   # @Prompt RTC port registers use MMIO.
-  gPcAtChipsetPkgTokenSpaceGuid.PcdRtcUseMmio|FALSE|BOOLEAN|0x00000021
+  gPcAtChipsetPkgTokenSpaceGuid.PcdRtcUseMmio|TRUE|BOOLEAN|0x00000021
 
 [PcdsFixedAtBuild, PcdsDynamic, PcdsDynamicEx, PcdsPatchableInModule]
   ## This PCD specifies the base address of the HPET timer.
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayloadPkg.dec
index 1ccfc32548..dcc5f2c4ad 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dec
+++ b/UefiPayloadPkg/UefiPayloadPkg.dec
@@ -85,7 +85,7 @@ gUefiPayloadPkgTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000|UINT32|0x
 gUefiPayloadPkgTokenSpaceGuid.PcdPcdDriverFile|{ 0x57, 0x72, 0xcf, 0x80, 0xab, 0x87, 0xf9, 0x47, 0xa3, 0xfe, 0xD5, 0x0B, 0x76, 0xd8, 0x95, 0x41 }|VOID*|0x00000018
 
 # Above 4G Memory
-gUefiPayloadPkgTokenSpaceGuid.PcdDispatchModuleAbove4GMemory|TRUE|BOOLEAN|0x00000019
+gUefiPayloadPkgTokenSpaceGuid.PcdDispatchModuleAbove4GMemory|FALSE|BOOLEAN|0x00000019
 
 # Boot Manager Key
 gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|FALSE|BOOLEAN|0x00000020
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index 2dbd875f37..2fd90452bf 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -34,7 +34,7 @@
   DEFINE SECURITY_STUB_ENABLE         = TRUE
   DEFINE SMM_SUPPORT                  = FALSE
   DEFINE PLATFORM_BOOT_TIMEOUT        = 3
-  DEFINE ABOVE_4G_MEMORY              = TRUE
+  DEFINE ABOVE_4G_MEMORY              = FALSE
   DEFINE BOOT_MANAGER_ESCAPE          = FALSE
   DEFINE ATA_ENABLE                   = TRUE
   DEFINE SD_ENABLE                    = TRUE
@@ -70,7 +70,7 @@
   # Serial port set up
   #
   DEFINE BAUD_RATE                    = 115200
-  DEFINE SERIAL_CLOCK_RATE            = 1843200
+  DEFINE SERIAL_CLOCK_RATE            = 47923200
   DEFINE SERIAL_LINE_CONTROL          = 3 # 8-bits, no parity
   DEFINE SERIAL_HARDWARE_FLOW_CONTROL = FALSE
   DEFINE SERIAL_DETECT_CABLE          = FALSE
@@ -130,7 +130,7 @@
   # For recent X86 CPU, 0x15 CPUID instruction will return Time Stamp Counter Frequence.
   # This is how BaseCpuTimerLib works, and a recommended way to get Frequence, so set the default value as TRUE.
   # Note: for emulation platform such as QEMU, this may not work and should set it as FALSE
-  DEFINE CPU_TIMER_LIB_ENABLE  = TRUE
+  DEFINE CPU_TIMER_LIB_ENABLE  = FALSE
 
   DEFINE MULTIPLE_DEBUG_PORT_SUPPORT = FALSE
 
@@ -285,7 +285,8 @@
   !endif
 !endif
 
-  DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+#  DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf 
   LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
@@ -496,11 +497,17 @@
   #
   # The following parameters are set by Library/PlatformHookLib
   #
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0
+ # gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|TRUE
+ # gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|$(BAUD_RATE)
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|1
-
+ # gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|4
+  #gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE
+  #gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0
+  #gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|1
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialPciDeviceInfo | {0xFF}
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase  | 0xFEDC9000
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio   | TRUE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride  | 0x4
   #
   # Enable these parameters to be set on the command line
   #
diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index ee7d718b3f..2da9803af0 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -9,7 +9,7 @@
 ##
 
 [Defines]
-DEFINE FD_BASE       = 0x00800000
+DEFINE FD_BASE       = 0x02182000
 DEFINE FD_BLOCK_SIZE = 0x00001000
 
 !if $(TARGET) == "NOOPT"