CorebootPayloadPkg: Use SerialDxe in MdeModulePkg

1. Update fdf and dsc to use SerialDxe in MdeModulePkg.
2. Separate the code that gets SerialRegBase and SerialRegAccessType
   by CbParseLib from CorebootPayloadPkg/Library/SerialPortLib to
   PlatformHookLib, and then leverage BaseSerialPortLib16550 in
   MdeModulePkg.
3. Remove CorebootPayloadPkg/SerialDxe and
   CorebootPayloadPkg/Library/SerialPortLib.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18968 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 92 insertions, 794 deletions

diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 810dcb1655..c160e43461 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -3,7 +3,7 @@
 #

 # Provides drivers and definitions to create uefi payload for coreboot. 

 #

-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials are licensed and made available under 

 # the terms and conditions of the BSD License that accompanies this distribution.  

 # The full text of the license may be found at

@@ -116,7 +116,7 @@ INF DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
 #

 # ISA Support

 #

-INF CorebootPayloadPkg/SerialDxe/SerialDxe.inf

+INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

 

 #

 # Console Support

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index 00a584234f..2c37e443fa 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -3,7 +3,7 @@
 #

 # Provides drivers and definitions to create uefi payload for coreboot. 

 #

-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials are licensed and made available under 

 # the terms and conditions of the BSD License that accompanies this distribution.  

 # The full text of the license may be found at

@@ -116,7 +116,8 @@
   #

   TimerLib|CorebootPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.inf

   ResetSystemLib|CorebootPayloadPkg/Library/ResetSystemLib/ResetSystemLib.inf

-  SerialPortLib|CorebootPayloadPkg/Library/SerialPortLib/SerialPortLib.inf

+  SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf

+  PlatformHookLib|CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf

   PlatformBdsLib|CorebootPayloadPkg/Library/PlatformBdsLib/PlatformBdsLib.inf

   

   #

@@ -214,6 +215,10 @@
   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2

 !endif

 

+[PcdsPatchableInModule.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x03F8

+

 ################################################################################

 #

 # Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform

@@ -340,7 +345,7 @@
   #

   # ISA Support

   #

-  CorebootPayloadPkg/SerialDxe/SerialDxe.inf

+  MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

   

   #

   # Console Support

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index ecd12fbf85..cfaf3048f8 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -3,7 +3,7 @@
 #

 # Provides drivers and definitions to create uefi payload for coreboot. 

 #

-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials are licensed and made available under 

 # the terms and conditions of the BSD License that accompanies this distribution.  

 # The full text of the license may be found at

@@ -116,7 +116,8 @@
   #

   TimerLib|CorebootPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.inf

   ResetSystemLib|CorebootPayloadPkg/Library/ResetSystemLib/ResetSystemLib.inf

-  SerialPortLib|CorebootPayloadPkg/Library/SerialPortLib/SerialPortLib.inf

+  SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf

+  PlatformHookLib|CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf

   PlatformBdsLib|CorebootPayloadPkg/Library/PlatformBdsLib/PlatformBdsLib.inf

   

   #

@@ -216,6 +217,10 @@
   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2

 !endif

 

+[PcdsPatchableInModule.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x03F8

+

 ################################################################################

 #

 # Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform

@@ -342,7 +347,7 @@
   #

   # ISA Support

   #

-  CorebootPayloadPkg/SerialDxe/SerialDxe.inf

+  MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

   

   #

   # Console Support

diff --git a/CorebootPayloadPkg/Library/PlatformBdsLib/BdsPlatform.h b/CorebootPayloadPkg/Library/PlatformBdsLib/BdsPlatform.h
index 975a771867..641e1cbf01 100644
--- a/CorebootPayloadPkg/Library/PlatformBdsLib/BdsPlatform.h
+++ b/CorebootPayloadPkg/Library/PlatformBdsLib/BdsPlatform.h
@@ -1,7 +1,7 @@
 /** @file

   Head file for BDS Platform specific code

 

-Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -29,7 +29,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DevicePathLib.h>

 

 #include <Protocol/PciIo.h>

-#include <Protocol/SerialIo.h>

 

 #include <Guid/GlobalVariable.h>

 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];

@@ -94,7 +93,7 @@ extern VENDOR_DEVICE_PATH         gUartDeviceVenderNode;
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8) \

       } \

     }, \

-    EFI_SERIAL_IO_PROTOCOL_GUID \

+    {0xD3987D4B, 0x971A, 0x435F, {0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41}} \

   }

     

 #define gUart \

diff --git a/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c
new file mode 100644
index 0000000000..10fd332fe5
--- /dev/null
+++ b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c
@@ -0,0 +1,56 @@
+/** @file

+  Platform Hook Library instance for UART device upon coreboot.

+

+  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

+  This program and the accompanying materials

+  are licensed and made available under the terms and conditions of the BSD License

+  which accompanies this distribution.  The full text of the license may be found at

+  http://opensource.org/licenses/bsd-license.php

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+**/

+

+#include <Base.h>

+#include <Uefi/UefiBaseType.h>

+#include <Library/PlatformHookLib.h>

+#include <Library/CbParseLib.h>

+#include <Library/PcdLib.h>

+

+/**

+  Performs platform specific initialization required for the CPU to access

+  the hardware associated with a SerialPortLib instance.  This function does

+  not intiailzie the serial port hardware itself.  Instead, it initializes

+  hardware devices that are required for the CPU to access the serial port

+  hardware.  This function may be called more than once.

+

+  @retval RETURN_SUCCESS       The platform specific initialization succeeded.

+  @retval RETURN_DEVICE_ERROR  The platform specific initialization could not be completed.

+

+**/

+RETURN_STATUS

+EFIAPI

+PlatformHookSerialPortInitialize (

+  VOID

+  )

+{

+  RETURN_STATUS     Status;

+  UINT32            SerialRegBase;

+  UINT32            SerialRegAccessType;

+

+  Status = CbParseSerialInfo (&SerialRegBase, &SerialRegAccessType, NULL);

+  if (RETURN_ERROR (Status)) {

+    return Status;

+  }

+

+  if (SerialRegAccessType == 2) { //MMIO

+    PcdSetBoolS (PcdSerialUseMmio, TRUE);

+  } else { //IO

+    PcdSetBoolS (PcdSerialUseMmio, FALSE);

+  }

+  PcdSet64S (PcdSerialRegisterBase, (UINT64) SerialRegBase);

+

+  return RETURN_SUCCESS;

+}

+

diff --git a/CorebootPayloadPkg/Library/SerialPortLib/SerialPortLib.inf b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
index c7e48f8bc1..e5db75fa95 100644
--- a/CorebootPayloadPkg/Library/SerialPortLib/SerialPortLib.inf
+++ b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
@@ -1,12 +1,12 @@
 ## @file

-#   SerialPortLib instance for UART device upon coreboot

+#  Platform Hook Library instance for UART device upon coreboot.

+#

+#  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

 #

-#  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

-#  which accompanies this distribution.  The full text of the license may be found at

+#  which accompanies this distribution. The full text of the license may be found at

 #  http://opensource.org/licenses/bsd-license.php

-#

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

@@ -14,29 +14,25 @@
 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = SerialPortLib

+  BASE_NAME                      = PlatformHookLib

   FILE_GUID                      = 40A2CBC6-CFB8-447b-A90E-198E88FD345E

   MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = SerialPortLib

-  

-  CONSTRUCTOR                    = SerialPortInitialize

-  

+  LIBRARY_CLASS                  = PlatformHookLib

+

 [Sources]

-  SerialPortLib.c

-  

+  PlatformHookLib.c

+

+[LibraryClasses]

+  CbParseLib

+  PcdLib

+

 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   CorebootModulePkg/CorebootModulePkg.dec

 

-[LibraryClasses]

-  BaseLib

-  PcdLib

-  IoLib

-  CbParseLib

-  

 [Pcd]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate

-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialLineControl

-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl
\ No newline at end of file
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio       ## PRODUCES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase  ## PRODUCES

+

diff --git a/CorebootPayloadPkg/Library/SerialPortLib/SerialPortLib.c b/CorebootPayloadPkg/Library/SerialPortLib/SerialPortLib.c
deleted file mode 100644
index 0d87e62b1b..0000000000
--- a/CorebootPayloadPkg/Library/SerialPortLib/SerialPortLib.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/** @file

-  SerialPortLib instance for UART device upon coreboot

-

-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>

-  This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#include <Uefi/UefiBaseType.h>

-#include <Library/SerialPortLib.h>

-#include <Library/PcdLib.h>

-#include <Library/IoLib.h>

-#include <Library/CbParseLib.h>

-

-//

-// 16550 UART register offsets and bitfields

-//

-#define R_UART_RXBUF          0

-#define R_UART_TXBUF          0

-#define R_UART_BAUD_LOW       0

-#define R_UART_BAUD_HIGH      1

-#define R_UART_FCR            2

-#define   B_UART_FCR_FIFOE    BIT0

-#define   B_UART_FCR_FIFO64   BIT5

-#define R_UART_LCR            3

-#define   B_UART_LCR_DLAB     BIT7

-#define R_UART_MCR            4

-#define   B_UART_MCR_RTS      BIT1

-#define R_UART_LSR            5

-#define   B_UART_LSR_RXRDY    BIT0

-#define   B_UART_LSR_TXRDY    BIT5

-#define   B_UART_LSR_TEMT     BIT6

-#define R_UART_MSR            6

-#define   B_UART_MSR_CTS      BIT4

-#define   B_UART_MSR_DSR      BIT5

-

-UINT32 mSerialRegBase = 0;

-UINT32 mSerialRegAccessType = 0;

-

-/**

-  Read an 8-bit 16550 register.  If PcdSerialUseMmio is TRUE, then the value is read from 

-  MMIO space.  If PcdSerialUseMmio is FALSE, then the value is read from I/O space.  The

-  parameter Offset is added to the base address of the 16550 registers that is specified 

-  by PcdSerialRegisterBase. 

-  

-  @param  Offset  The offset of the 16550 register to read.

-

-  @return The value read from the 16550 register.

-

-**/

-UINT8

-SerialPortReadRegister (

-  UINTN  Offset

-  )

-{

-  if (mSerialRegAccessType == 2) { //MMIO

-    return MmioRead8 (mSerialRegBase + Offset);

-  } else { //IO

-    return IoRead8 ((UINT16)mSerialRegBase + Offset);

-  }

-}

-

-/**

-  Write an 8-bit 16550 register.  If PcdSerialUseMmio is TRUE, then the value is written to

-  MMIO space.  If PcdSerialUseMmio is FALSE, then the value is written to I/O space.  The

-  parameter Offset is added to the base address of the 16550 registers that is specified 

-  by PcdSerialRegisterBase. 

-  

-  @param  Offset  The offset of the 16550 register to write.

-  @param  Value   The value to write to the 16550 register specified by Offset.

-

-  @return The value written to the 16550 register.

-

-**/

-UINT8

-SerialPortWriteRegister (

-  UINTN  Offset,

-  UINT8  Value

-  )

-{

-  if (mSerialRegAccessType == 2) { //MMIO

-    return MmioWrite8 (mSerialRegBase + Offset, Value);

-  } else {// IO

-    return IoWrite8 ((UINT16)mSerialRegBase + Offset, Value);

-  }

-}

-

-/**

-  Initialize the serial device hardware.

-  

-  If no initialization is required, then return RETURN_SUCCESS.

-  If the serial device was successfully initialized, then return RETURN_SUCCESS.

-  If the serial device could not be initialized, then return RETURN_DEVICE_ERROR.

-  

-  @retval RETURN_SUCCESS        The serial device was initialized.

-  @retval RETURN_DEVICE_ERROR   The serial device could not be initialized.

-

-**/

-RETURN_STATUS

-EFIAPI

-SerialPortInitialize (

-  VOID

-  )

-{

-  RETURN_STATUS  Status;

-  UINTN          Divisor;

-  BOOLEAN        Initialized;

-  

-  Status = CbParseSerialInfo (&mSerialRegBase, &mSerialRegAccessType, NULL);

-  if (RETURN_ERROR (Status)) {

-    return Status;

-  }

-

-  //

-  // See if the serial port is already initialized

-  //

-  Initialized = TRUE;

-  if ((SerialPortReadRegister (R_UART_FCR) & (B_UART_FCR_FIFOE | B_UART_FCR_FIFO64)) !=

-      (PcdGet8 (PcdSerialFifoControl)      & (B_UART_FCR_FIFOE | B_UART_FCR_FIFO64))     ) {

-    Initialized = FALSE;

-  }

-

-  if ((SerialPortReadRegister (R_UART_LCR) & 0x3F) != (PcdGet8 (PcdSerialLineControl) & 0x3F)) {

-    Initialized = FALSE;

-  }

-  SerialPortWriteRegister (R_UART_LCR, (UINT8)(SerialPortReadRegister (R_UART_LCR) | B_UART_LCR_DLAB));

-  Divisor =  SerialPortReadRegister (R_UART_BAUD_HIGH) << 8;

-  Divisor |= SerialPortReadRegister (R_UART_BAUD_LOW);

-  SerialPortWriteRegister (R_UART_LCR, (UINT8)(SerialPortReadRegister (R_UART_LCR) & ~B_UART_LCR_DLAB));

-  if (Divisor != 115200 / PcdGet32 (PcdSerialBaudRate)) {

-    Initialized = FALSE;

-  }

-  if (Initialized) {

-    return RETURN_SUCCESS;

-  }

-  

-  //

-  // Configure baud rate

-  //

-  Divisor = 115200 / PcdGet32 (PcdSerialBaudRate);

-  SerialPortWriteRegister (R_UART_LCR, B_UART_LCR_DLAB);

-  SerialPortWriteRegister (R_UART_BAUD_HIGH, (UINT8) (Divisor >> 8));

-  SerialPortWriteRegister (R_UART_BAUD_LOW, (UINT8) (Divisor & 0xff));

-

-  //

-  // Clear DLAB and configure Data Bits, Parity, and Stop Bits.

-  // Strip reserved bits from PcdSerialLineControl

-  //

-  SerialPortWriteRegister (R_UART_LCR, (UINT8)(PcdGet8 (PcdSerialLineControl) & 0x3F));

-

-  //

-  // Enable and reset FIFOs

-  // Strip reserved bits from PcdSerialFifoControl

-  //

-  SerialPortWriteRegister (R_UART_FCR, (UINT8)(PcdGet8 (PcdSerialFifoControl) & 0x27));

-

-  //

-  // Put Modem Control Register(MCR) into its reset state of 0x00.

-  //  

-  SerialPortWriteRegister (R_UART_MCR, 0x00);

-  

-  return RETURN_SUCCESS;

-}

-

-/**

-  Write data from buffer to serial device. 

- 

-  Writes NumberOfBytes data bytes from Buffer to the serial device.  

-  The number of bytes actually written to the serial device is returned.

-  If the return value is less than NumberOfBytes, then the write operation failed.

-

-  If Buffer is NULL, then ASSERT(). 

-

-  If NumberOfBytes is zero, then return 0.

-

-  @param  Buffer           Pointer to the data buffer to be written.

-  @param  NumberOfBytes    Number of bytes to written to the serial device.

-

-  @retval 0                NumberOfBytes is 0.

-  @retval >0               The number of bytes written to the serial device.  

-                           If this value is less than NumberOfBytes, then the read operation failed.

-

-**/

-UINTN

-EFIAPI

-SerialPortWrite (

-  IN UINT8     *Buffer,

-  IN UINTN     NumberOfBytes

-)

-{

-  UINTN    Result;

-  UINTN    Index;

-  UINTN    FifoSize;

-

-  if (Buffer == NULL) {

-    return 0;

-  }

-

-  if (NumberOfBytes == 0) {

-    //

-    // Flush the hardware

-    //

-

-    //

-    // Wait for both the transmit FIFO and shift register empty.

-    //

-    while ((SerialPortReadRegister (R_UART_LSR) & B_UART_LSR_TEMT) == 0);

-

-    return 0;

-  }

-

-  //

-  // Compute the maximum size of the Tx FIFO

-  //

-  FifoSize = 1;

-  if ((PcdGet8 (PcdSerialFifoControl) & B_UART_FCR_FIFOE) != 0) {

-    if ((PcdGet8 (PcdSerialFifoControl) & B_UART_FCR_FIFO64) == 0) {

-      FifoSize = 16;

-    } else {

-      FifoSize = 64;

-    }

-  }

-

-  Result = NumberOfBytes;

-  while (NumberOfBytes != 0) {

-    //

-    // Wait for the serial port to be ready, to make sure both the transmit FIFO

-    // and shift register empty.

-    //

-    while ((SerialPortReadRegister (R_UART_LSR) & B_UART_LSR_TEMT) == 0);

-

-    //

-    // Fill then entire Tx FIFO

-    //

-    for (Index = 0; Index < FifoSize && NumberOfBytes != 0; Index++, NumberOfBytes--, Buffer++) {

-

-      //

-      // Write byte to the transmit buffer.

-      //

-      SerialPortWriteRegister (R_UART_TXBUF, *Buffer);

-    }

-  }

-  return Result;

-}

-

-/**

-  Reads data from a serial device into a buffer.

-

-  @param  Buffer           Pointer to the data buffer to store the data read from the serial device.

-  @param  NumberOfBytes    Number of bytes to read from the serial device.

-

-  @retval 0                NumberOfBytes is 0.

-  @retval >0               The number of bytes read from the serial device.  

-                           If this value is less than NumberOfBytes, then the read operation failed.

-

-**/

-UINTN

-EFIAPI

-SerialPortRead (

-  OUT UINT8     *Buffer,

-  IN  UINTN     NumberOfBytes

-)

-{

-  UINTN  Result;

-

-  if (NULL == Buffer) {

-    return 0;

-  }

-  

-  for (Result = 0; NumberOfBytes-- != 0; Result++, Buffer++) {

-    //

-    // Wait for the serial port to have some data.

-    //

-    while ((SerialPortReadRegister (R_UART_LSR) & B_UART_LSR_RXRDY) == 0);

-        

-    //

-    // Read byte from the receive buffer.

-    //

-    *Buffer = SerialPortReadRegister (R_UART_RXBUF);

-  }

-  

-  return Result;

-}

-

-/**

-  Polls a serial device to see if there is any data waiting to be read.

-

-  Polls aserial device to see if there is any data waiting to be read.

-  If there is data waiting to be read from the serial device, then TRUE is returned.

-  If there is no data waiting to be read from the serial device, then FALSE is returned.

-

-  @retval TRUE             Data is waiting to be read from the serial device.

-  @retval FALSE            There is no data waiting to be read from the serial device.

-

-**/

-BOOLEAN

-EFIAPI

-SerialPortPoll (

-  VOID

-  )

-{

-  //

-  // Read the serial port status

-  //

-  if ((SerialPortReadRegister (R_UART_LSR) & B_UART_LSR_RXRDY) != 0) {

-    return TRUE;

-  }  

-  

-  return FALSE;

-}

diff --git a/CorebootPayloadPkg/SerialDxe/SerialDxe.inf b/CorebootPayloadPkg/SerialDxe/SerialDxe.inf
deleted file mode 100644
index 04d993534e..0000000000
--- a/CorebootPayloadPkg/SerialDxe/SerialDxe.inf
+++ /dev/null
@@ -1,55 +0,0 @@
-#/** @file

-#  

-#  Convert SerialLib into SerialIo protocol

-#  

-#  Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>

-#  This program and the accompanying materials

-#  are licensed and made available under the terms and conditions of the BSD License

-#  which accompanies this distribution.  The full text of the license may be found at

-#  http://opensource.org/licenses/bsd-license.php

-#  

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#  

-#**/

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = SerialDxe

-  FILE_GUID                      = D3987D4B-971A-435F-8CAF-4967EB627241

-  MODULE_TYPE                    = DXE_DRIVER

-  VERSION_STRING                 = 1.0

-

-  ENTRY_POINT                    = SerialDxeInitialize

-

-[Sources.common]

-  SerialIo.c

-

-[Packages]

-  MdePkg/MdePkg.dec

-  MdeModulePkg/MdeModulePkg.dec

-

-[LibraryClasses]

-  BaseLib

-  ReportStatusCodeLib

-  MemoryAllocationLib

-  UefiLib

-  UefiBootServicesTableLib

-  BaseMemoryLib

-  DebugLib

-  UefiDriverEntryPoint

-  SerialPortLib

-  

-

-[Protocols]

-  gEfiSerialIoProtocolGuid    

-  gEfiDevicePathProtocolGuid

-

-[FixedPcd]

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits

-

-[Depex] 

-  TRUE

diff --git a/CorebootPayloadPkg/SerialDxe/SerialIo.c b/CorebootPayloadPkg/SerialDxe/SerialIo.c
deleted file mode 100644
index cdede32166..0000000000
--- a/CorebootPayloadPkg/SerialDxe/SerialIo.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/** @file

-  Serial IO Abstraction for GDB stub. This allows an EFI consoles that shows up on the system 

-  running GDB. One console for error information and another console for user input/output.

-  

-  Basic packet format is $packet-data#checksum. So every command has 4 bytes of overhead: $,

-  #, 0, 0. The 0 and 0 are the ascii characters for the checksum. 

-  

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  Copyright (c) 2013, ARM Ltd. All rights reserved.<BR>

-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>

-  

-  This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#include <PiDxe.h>

-#include <Library/UefiLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/DebugLib.h>

-#include <Library/SerialPortLib.h>

-#include <Library/PcdLib.h>

-

-#include <Protocol/SerialIo.h>

-

-typedef struct {

-  VENDOR_DEVICE_PATH        Guid;

-  UART_DEVICE_PATH          Uart;

-  EFI_DEVICE_PATH_PROTOCOL  End;

-} SIMPLE_TEXT_OUT_DEVICE_PATH;

-

-SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = {

-  {

-    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },

-    EFI_SERIAL_IO_PROTOCOL_GUID // Use the drivers GUID

-  },

-  {

-    { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} },

-    0,        // Reserved

-    FixedPcdGet64 (PcdUartDefaultBaudRate),   // BaudRate

-    FixedPcdGet8 (PcdUartDefaultDataBits),    // DataBits

-    FixedPcdGet8 (PcdUartDefaultParity),      // Parity (N)

-    FixedPcdGet8 (PcdUartDefaultStopBits)     // StopBits

-  },

-  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 } }

-};

-

-EFI_HANDLE  gHandle = NULL;

-

-/**

-  Reset the serial device.

-

-  @param  This              Protocol instance pointer.

-                            

-  @retval EFI_SUCCESS       The device was reset.

-  @retval EFI_DEVICE_ERROR  The serial device could not be reset.

-

-**/

-EFI_STATUS

-EFIAPI

-SerialReset (

-  IN EFI_SERIAL_IO_PROTOCOL  *This

-  )

-{

-  EFI_STATUS  Status;

-  EFI_TPL     Tpl;

-

-  Status = SerialPortInitialize ();

-  if (EFI_ERROR(Status)) {

-    return Status;

-  }

-

-  //

-  // Set the Serial I/O mode and update the device path

-  //

-

-  Tpl = gBS->RaiseTPL (TPL_NOTIFY);

-

-  //

-  // Set the Serial I/O mode

-  //

-  This->Mode->ReceiveFifoDepth  = 0;

-  This->Mode->Timeout           = 1000000;

-  This->Mode->BaudRate          = PcdGet64 (PcdUartDefaultBaudRate);

-  This->Mode->DataBits          = (UINT32)PcdGet8 (PcdUartDefaultDataBits);

-  This->Mode->Parity            = (UINT32)PcdGet8 (PcdUartDefaultParity);

-  This->Mode->StopBits          = (UINT32)PcdGet8 (PcdUartDefaultStopBits);

-

-  //

-  // Check if the device path has actually changed

-  //

-  if (mDevicePath.Uart.BaudRate == This->Mode->BaudRate &&

-      mDevicePath.Uart.DataBits == (UINT8)This->Mode->DataBits &&

-      mDevicePath.Uart.Parity   == (UINT8)This->Mode->Parity &&

-      mDevicePath.Uart.StopBits == (UINT8)This->Mode->StopBits

-     ) {

-    gBS->RestoreTPL (Tpl);

-    return EFI_SUCCESS;

-  }

-

-  //

-  // Update the device path

-  //

-  mDevicePath.Uart.BaudRate = This->Mode->BaudRate;

-  mDevicePath.Uart.DataBits = (UINT8)This->Mode->DataBits;

-  mDevicePath.Uart.Parity   = (UINT8)This->Mode->Parity;

-  mDevicePath.Uart.StopBits = (UINT8)This->Mode->StopBits;

-

-  Status = gBS->ReinstallProtocolInterface (

-                  gHandle,

-                  &gEfiDevicePathProtocolGuid,

-                  &mDevicePath,

-                  &mDevicePath

-                  );

-

-  gBS->RestoreTPL (Tpl);

-

-  return Status;

-}

-

-

-/**

-  Sets the baud rate, receive FIFO depth, transmit/receive time out, parity,

-  data buts, and stop bits on a serial device.

-

-  @param  This             Protocol instance pointer.

-  @param  BaudRate         The requested baud rate. A BaudRate value of 0 will use the the

-                           device's default interface speed.

-  @param  ReceiveFifoDepth The requested depth of the FIFO on the receive side of the

-                           serial interface. A ReceiveFifoDepth value of 0 will use

-                           the device's default FIFO depth.

-  @param  Timeout          The requested time out for a single character in microseconds.

-                           This timeout applies to both the transmit and receive side of the

-                           interface. A Timeout value of 0 will use the device's default time

-                           out value.

-  @param  Parity           The type of parity to use on this serial device. A Parity value of

-                           DefaultParity will use the device's default parity value.

-  @param  DataBits         The number of data bits to use on the serial device. A DataBits

-                           value of 0 will use the device's default data bit setting.

-  @param  StopBits         The number of stop bits to use on this serial device. A StopBits

-                           value of DefaultStopBits will use the device's default number of

-                           stop bits.

-

-  @retval EFI_SUCCESS      The device was reset.

-  @retval EFI_DEVICE_ERROR The serial device could not be reset.

-

-**/

-EFI_STATUS

-EFIAPI

-SerialSetAttributes (

-  IN EFI_SERIAL_IO_PROTOCOL  *This,

-  IN UINT64                  BaudRate,

-  IN UINT32                  ReceiveFifoDepth,

-  IN UINT32                  Timeout,

-  IN EFI_PARITY_TYPE         Parity,

-  IN UINT8                   DataBits,

-  IN EFI_STOP_BITS_TYPE      StopBits

-  )

-{

-  EFI_STATUS  Status;

-  EFI_TPL     Tpl;

-

-  //

-  // Set the Serial I/O mode and update the device path

-  //

-

-  Tpl = gBS->RaiseTPL (TPL_NOTIFY);

-

-  //

-  // Set the Serial I/O mode

-  //

-  This->Mode->BaudRate          = BaudRate;

-  This->Mode->ReceiveFifoDepth  = ReceiveFifoDepth;

-  This->Mode->Timeout           = Timeout;

-  This->Mode->Parity            = (UINT32)Parity;

-  This->Mode->DataBits          = (UINT32)DataBits;

-  This->Mode->StopBits          = (UINT32)StopBits;

-

-  //

-  // Check if the device path has actually changed

-  //

-  if (mDevicePath.Uart.BaudRate == BaudRate &&

-      mDevicePath.Uart.Parity   == (UINT8)Parity &&

-      mDevicePath.Uart.DataBits == DataBits &&

-      mDevicePath.Uart.StopBits == (UINT8)StopBits

-     ) {

-    gBS->RestoreTPL (Tpl);

-    return EFI_SUCCESS;

-  }

-

-  //

-  // Update the device path

-  //

-  mDevicePath.Uart.BaudRate = BaudRate;

-  mDevicePath.Uart.DataBits = DataBits;

-  mDevicePath.Uart.Parity   = (UINT8) Parity;

-  mDevicePath.Uart.StopBits = (UINT8) StopBits;

-

-  Status = gBS->ReinstallProtocolInterface (

-                  gHandle,

-                  &gEfiDevicePathProtocolGuid,

-                  &mDevicePath,

-                  &mDevicePath

-                  );

-

-  gBS->RestoreTPL (Tpl);

-

-  return Status;

-}

-

-

-/**

-  Set the control bits on a serial device

-

-  @param  This             Protocol instance pointer.

-  @param  Control          Set the bits of Control that are settable.

-

-  @retval EFI_SUCCESS      The new control bits were set on the serial device.

-  @retval EFI_UNSUPPORTED  The serial device does not support this operation.

-  @retval EFI_DEVICE_ERROR The serial device is not functioning correctly.

-

-**/

-EFI_STATUS

-EFIAPI

-SerialSetControl (

-  IN EFI_SERIAL_IO_PROTOCOL  *This,

-  IN UINT32                  Control

-  )

-{

-  return EFI_UNSUPPORTED;

-}

-

-

-/**

-  Retrieves the status of the control bits on a serial device

-

-  @param  This              Protocol instance pointer.

-  @param  Control           A pointer to return the current Control signals from the serial device.

-                            

-  @retval EFI_SUCCESS       The control bits were read from the serial device.

-  @retval EFI_DEVICE_ERROR  The serial device is not functioning correctly.

-

-**/

-EFI_STATUS

-EFIAPI

-SerialGetControl (

-  IN EFI_SERIAL_IO_PROTOCOL  *This,

-  OUT UINT32                 *Control

-  )

-{

-  if (SerialPortPoll ()) {

-    // If a character is pending don't set EFI_SERIAL_INPUT_BUFFER_EMPTY

-    *Control = EFI_SERIAL_OUTPUT_BUFFER_EMPTY;

-  } else {

-    *Control = EFI_SERIAL_INPUT_BUFFER_EMPTY | EFI_SERIAL_OUTPUT_BUFFER_EMPTY;

-  }

-  return EFI_SUCCESS;

-}

-

-

-/**

-  Writes data to a serial device.

-

-  @param  This              Protocol instance pointer.

-  @param  BufferSize        On input, the size of the Buffer. On output, the amount of

-                            data actually written.

-  @param  Buffer            The buffer of data to write

-

-  @retval EFI_SUCCESS       The data was written.

-  @retval EFI_DEVICE_ERROR  The device reported an error.

-  @retval EFI_TIMEOUT       The data write was stopped due to a timeout.

-

-**/

-EFI_STATUS

-EFIAPI

-SerialWrite (

-  IN EFI_SERIAL_IO_PROTOCOL  *This,

-  IN OUT UINTN               *BufferSize,

-  IN VOID                    *Buffer

-  )

-{

-  UINTN Count;

-  

-  Count = SerialPortWrite (Buffer, *BufferSize);

-

-  if (Count != *BufferSize) {

-    *BufferSize = Count;

-    return EFI_TIMEOUT;

-  }

-

-  return EFI_SUCCESS;

-}

-

-/**

-  Reads data from a serial device.

-

-  @param  This              Protocol instance pointer.

-  @param  BufferSize        On input, the size of the Buffer. On output, the amount of

-                            data returned in Buffer.

-  @param  Buffer            The buffer to return the data into.

-

-  @retval EFI_SUCCESS       The data was read.

-  @retval EFI_DEVICE_ERROR  The device reported an error.

-  @retval EFI_TIMEOUT       The data write was stopped due to a timeout.

-

-**/

-

-EFI_STATUS

-EFIAPI

-SerialRead (

-  IN EFI_SERIAL_IO_PROTOCOL  *This,

-  IN OUT UINTN               *BufferSize,

-  OUT VOID                   *Buffer

-  )

-{

-  UINTN Count = 0;

-

-  if (SerialPortPoll()) {

-    Count = SerialPortRead (Buffer, *BufferSize);

-  }

-

-  if (Count != *BufferSize) {

-    *BufferSize = Count;

-    return EFI_TIMEOUT;

-  }

-

-  return EFI_SUCCESS;

-}

-

-// 

-// Template used to initialize the GDB Serial IO protocols

-//

-EFI_SERIAL_IO_MODE gSerialIoMode = {

-  0,                                          // ControlMask

-  0,                                          // Timeout

-  FixedPcdGet64 (PcdUartDefaultBaudRate),     // BaudRate

-  1,                                          // ReceiveFifoDepth

-  FixedPcdGet8 (PcdUartDefaultDataBits),      // DataBits

-  FixedPcdGet8 (PcdUartDefaultParity),        // Parity

-  FixedPcdGet8 (PcdUartDefaultStopBits)       // StopBits

-};

-

-

-EFI_SERIAL_IO_PROTOCOL gSerialIoTemplate = {

-  SERIAL_IO_INTERFACE_REVISION,

-  SerialReset,

-  SerialSetAttributes,

-  SerialSetControl,

-  SerialGetControl,

-  SerialWrite,

-  SerialRead,

-  &gSerialIoMode

-};

-

-/**

-  Initialize the state information for the Serial Io Protocol

-

-  @param  ImageHandle   of the loaded driver

-  @param  SystemTable   Pointer to the System Table

-

-  @retval EFI_SUCCESS           Protocol registered

-  @retval EFI_OUT_OF_RESOURCES  Cannot allocate protocol data structure

-  @retval EFI_DEVICE_ERROR      Hardware problems

-

-**/

-EFI_STATUS

-EFIAPI

-SerialDxeInitialize (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

-  )

-{

-  EFI_STATUS      Status;

-

-  // Make a new handle with Serial IO protocol and its device path on it.

-  Status = gBS->InstallMultipleProtocolInterfaces (

-                  &gHandle, 

-                  &gEfiSerialIoProtocolGuid,   &gSerialIoTemplate,

-                  &gEfiDevicePathProtocolGuid, &mDevicePath, 

-                  NULL

-                  );

-  ASSERT_EFI_ERROR (Status);

-  

-  return Status;

-}

-