ArmVirtPkg: switch to new PL011UartLib implementation

Switch to the new, cleaned up PL011UartLib implementation so we will
be able to remove the old one.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Ard Biesheuvel 2017-11-16 17:08:08 +00:00
parent 12156134fe
commit 1195b85787
3 changed files with 3 additions and 5 deletions

View File

@ -106,7 +106,7 @@
RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
# ARM PL011 UART Driver # ARM PL011 UART Driver
PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf
# #

View File

@ -19,11 +19,10 @@
#include <Base.h> #include <Base.h>
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
#include <Library/PL011UartLib.h>
#include <Library/SerialPortLib.h> #include <Library/SerialPortLib.h>
#include <libfdt.h> #include <libfdt.h>
#include <Drivers/PL011Uart.h>
RETURN_STATUS RETURN_STATUS
EFIAPI EFIAPI
SerialPortInitialize ( SerialPortInitialize (

View File

@ -20,6 +20,7 @@
#include <Base.h> #include <Base.h>
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
#include <Library/PL011UartLib.h>
#include <Library/SerialPortLib.h> #include <Library/SerialPortLib.h>
#include <Pi/PiBootMode.h> #include <Pi/PiBootMode.h>
#include <Uefi/UefiBaseType.h> #include <Uefi/UefiBaseType.h>
@ -28,8 +29,6 @@
#include <Library/HobLib.h> #include <Library/HobLib.h>
#include <Guid/EarlyPL011BaseAddress.h> #include <Guid/EarlyPL011BaseAddress.h>
#include <Drivers/PL011Uart.h>
STATIC UINTN mSerialBaseAddress; STATIC UINTN mSerialBaseAddress;
RETURN_STATUS RETURN_STATUS