summaryrefslogtreecommitdiffstats
path: root/ArmVirtPkg/Library
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2017-11-16 17:08:08 +0000
committerArd Biesheuvel <ard.biesheuvel@linaro.org>2017-11-17 10:02:36 +0000
commit1195b8578764909858fe7d8458ab67f098fff182 (patch)
tree16bb9da57779f9f44c05970419835febb70c6276 /ArmVirtPkg/Library
parent12156134fe82e5c574a78898184935c0486b29ad (diff)
downloadedk2-1195b8578764909858fe7d8458ab67f098fff182.tar.gz
edk2-1195b8578764909858fe7d8458ab67f098fff182.tar.bz2
edk2-1195b8578764909858fe7d8458ab67f098fff182.zip
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>
Diffstat (limited to 'ArmVirtPkg/Library')
-rw-r--r--ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c3
-rw-r--r--ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c
index e28750f3b4..f0924dacbc 100644
--- a/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c
+++ b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c
@@ -19,11 +19,10 @@
#include <Base.h>
#include <Library/PcdLib.h>
+#include <Library/PL011UartLib.h>
#include <Library/SerialPortLib.h>
#include <libfdt.h>
-#include <Drivers/PL011Uart.h>
-
RETURN_STATUS
EFIAPI
SerialPortInitialize (
diff --git a/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c b/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c
index 05d3547fda..8b736fd11f 100644
--- a/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c
+++ b/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c
@@ -20,6 +20,7 @@
#include <Base.h>
#include <Library/PcdLib.h>
+#include <Library/PL011UartLib.h>
#include <Library/SerialPortLib.h>
#include <Pi/PiBootMode.h>
#include <Uefi/UefiBaseType.h>
@@ -28,8 +29,6 @@
#include <Library/HobLib.h>
#include <Guid/EarlyPL011BaseAddress.h>
-#include <Drivers/PL011Uart.h>
-
STATIC UINTN mSerialBaseAddress;
RETURN_STATUS