From c6e51751e026c9d4e98e597cdebcd3c7b1b97281 Mon Sep 17 00:00:00 2001
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Thu, 16 Nov 2017 16:34:49 +0000
Subject: [PATCH] ArmPlatformPkg: move internal PL031 header into driver
 directory

Move the internal PL031 RTC header file into the driver directory.
It shouldn't be referenced directly by other modules anyway.

While at it, sort the includes as well.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 .../PL031RealTimeClock.h                      |  0
 .../PL031RealTimeClockLib.c                   | 19 +++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)
 rename ArmPlatformPkg/{Include/Drivers => Library/PL031RealTimeClockLib}/PL031RealTimeClock.h (100%)

diff --git a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClock.h
similarity index 100%
rename from ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
rename to ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClock.h
diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
index 1334ad446c..1d787cf5df 100644
--- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
+++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
@@ -14,28 +14,27 @@
 
 **/
 
-#include <Uefi.h>
 #include <PiDxe.h>
+
+#include <Guid/EventGroup.h>
+#include <Guid/GlobalVariable.h>
+
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
-#include <Library/UefiLib.h>
+#include <Library/DxeServicesTableLib.h>
 #include <Library/IoLib.h>
-#include <Library/RealTimeClockLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PcdLib.h>
-#include <Library/DxeServicesTableLib.h>
+#include <Library/RealTimeClockLib.h>
+#include <Library/TimeBaseLib.h>
 #include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/UefiRuntimeLib.h>
 
 #include <Protocol/RealTimeClock.h>
 
-#include <Guid/GlobalVariable.h>
-#include <Guid/EventGroup.h>
-
-#include <Drivers/PL031RealTimeClock.h>
-
-#include <Library/TimeBaseLib.h>
+#include "PL031RealTimeClock.h"
 
 STATIC BOOLEAN                mPL031Initialized = FALSE;
 STATIC EFI_EVENT              mRtcVirtualAddrChangeEvent;