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>

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index c92a69281ae46eeeaae9c5b8c457f062fec73f1c..50eb8675d1c08b5c0ddae5b4bf5f76e7fee3ae51 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -106,7 +106,7 @@
   RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf\r
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf\r
   # ARM PL011 UART Driver\r
-  PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf\r
+  PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf\r
   SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf\r
 \r
   #\r

diff --git a/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c
index e28750f3b4c4ce5412e76c39e5f9b185dc6b0153..f0924dacbc345a61610138b9b1230e1014fe884b 100644 (file)
--- a/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c
+++ b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c
@@ -19,11 +19,10 @@
 #include <Base.h>\r
 \r
 #include <Library/PcdLib.h>\r
+#include <Library/PL011UartLib.h>\r
 #include <Library/SerialPortLib.h>\r
 #include <libfdt.h>\r
 \r
-#include <Drivers/PL011Uart.h>\r
-\r
 RETURN_STATUS\r
 EFIAPI\r
 SerialPortInitialize (\r

diff --git a/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c b/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c
index 05d3547fda913169ee10b120d17f648cd9ad4122..8b736fd11f3a2b743b2473d9ac188147e3a32ef0 100644 (file)
--- a/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c
+++ b/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c
@@ -20,6 +20,7 @@
 #include <Base.h>\r
 \r
 #include <Library/PcdLib.h>\r
+#include <Library/PL011UartLib.h>\r
 #include <Library/SerialPortLib.h>\r
 #include <Pi/PiBootMode.h>\r
 #include <Uefi/UefiBaseType.h>\r
@@ -28,8 +29,6 @@
 #include <Library/HobLib.h>\r
 #include <Guid/EarlyPL011BaseAddress.h>\r
 \r
-#include <Drivers/PL011Uart.h>\r
-\r
 STATIC UINTN mSerialBaseAddress;\r
 \r
 RETURN_STATUS\r