Platforms/TexasInstruments: sync Beagle with upstream

Update to work with moved SerialDxe and deleted GlobalVariableLib.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

3 files changed, 92 insertions, 5 deletions

diff --git a/Chips/TexasInstruments/Omap35xx/Library/SerialPortLib/SerialPortLib.c b/Chips/TexasInstruments/Omap35xx/Library/SerialPortLib/SerialPortLib.c
index 58f70d5..7ac12c7 100644
--- a/Chips/TexasInstruments/Omap35xx/Library/SerialPortLib/SerialPortLib.c
+++ b/Chips/TexasInstruments/Omap35xx/Library/SerialPortLib/SerialPortLib.c
@@ -3,6 +3,7 @@
 

 

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

+  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

@@ -122,3 +123,92 @@ SerialPortPoll (
   }

 }

 

+/**

+  Sets the control bits on a serial device.

+

+  @param[in] Control            Sets the bits of Control that are settable.

+

+  @retval RETURN_SUCCESS        The new control bits were set on the serial device.

+  @retval RETURN_UNSUPPORTED    The serial device does not support this operation.

+  @retval RETURN_DEVICE_ERROR   The serial device is not functioning correctly.

+

+**/

+RETURN_STATUS

+EFIAPI

+SerialPortSetControl (

+  IN UINT32 Control

+  )

+{

+  return RETURN_UNSUPPORTED;

+}

+

+/**

+  Retrieve the status of the control bits on a serial device.

+

+  @param[out] Control           A pointer to return the current control signals from the serial device.

+

+  @retval RETURN_SUCCESS        The control bits were read from the serial device.

+  @retval RETURN_UNSUPPORTED    The serial device does not support this operation.

+  @retval RETURN_DEVICE_ERROR   The serial device is not functioning correctly.

+

+**/

+RETURN_STATUS

+EFIAPI

+SerialPortGetControl (

+  OUT UINT32 *Control

+  )

+{

+  *Control = 0;

+  if (!SerialPortPoll ()) {

+    *Control = EFI_SERIAL_INPUT_BUFFER_EMPTY;

+  }

+  return RETURN_SUCCESS;

+}

+

+/**

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

+  data bits, and stop bits on a serial device.

+

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

+                            device's default interface speed.

+                            On output, the value actually set.

+  @param ReveiveFifoDepth   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.

+                            On output, the value actually set.

+  @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.

+                            On output, the value actually set.

+  @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.

+                            On output, the value actually set.

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

+                            vaule of 0 will use the device's default data bit setting.

+                            On output, the value actually set.

+  @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.

+                            On output, the value actually set.

+

+  @retval RETURN_SUCCESS            The new attributes were set on the serial device.

+  @retval RETURN_UNSUPPORTED        The serial device does not support this operation.

+  @retval RETURN_INVALID_PARAMETER  One or more of the attributes has an unsupported value.

+  @retval RETURN_DEVICE_ERROR       The serial device is not functioning correctly.

+

+**/

+RETURN_STATUS

+EFIAPI

+SerialPortSetAttributes (

+  IN OUT UINT64             *BaudRate,

+  IN OUT UINT32             *ReceiveFifoDepth,

+  IN OUT UINT32             *Timeout,

+  IN OUT EFI_PARITY_TYPE    *Parity,

+  IN OUT UINT8              *DataBits,

+  IN OUT EFI_STOP_BITS_TYPE *StopBits

+  )

+{

+  return RETURN_UNSUPPORTED;

+}

+

diff --git a/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc b/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc
index b788563..73c8d6a 100644
--- a/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc
+++ b/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc
@@ -87,7 +87,6 @@
   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf

 

   SerialPortLib|OpenPlatformPkg/Chips/TexasInstruments/Omap35xx/Library/SerialPortLib/SerialPortLib.inf

-  SerialPortExtLib|EmbeddedPkg/Library/TemplateSerialPortExtLib/TemplateSerialPortExtLib.inf

   SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf

 

   RealTimeClockLib|OpenPlatformPkg/Chips/TexasInstruments/Omap35xx/Library/RealTimeClockLib/RealTimeClockLib.inf

@@ -132,7 +131,6 @@
 

 [LibraryClasses.common.SEC]

   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf

-  ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf

 

   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

@@ -178,7 +176,6 @@
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf

-  ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Dxe/DxeArmPlatformGlobalVariableLib.inf

 

 [LibraryClasses.common.UEFI_APPLICATION]

   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

@@ -401,7 +398,7 @@
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

-  EmbeddedPkg/SerialDxe/SerialDxe.inf

+  MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

 #

 # This version uses semi-hosting console

diff --git a/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.fdf b/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.fdf
index 702ca3e..9728efd 100644
--- a/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.fdf
+++ b/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.fdf
@@ -101,7 +101,7 @@ FvNameGuid         = d0dd3e90-343d-4cb3-8f69-772214989282
   INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

   INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

   INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

-  INF EmbeddedPkg/SerialDxe/SerialDxe.inf

+  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

 

   INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf