2 files changed, 54 insertions, 10 deletions
diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClock.h b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClock.h
new file mode 100644
index 0000000000..812cd9b397
--- /dev/null
+++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClock.h
@@ -0,0 +1,45 @@
+/** @file
+*
+*  Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
+*
+*  This program and the accompanying materials
+*  are licensed and made available under the terms and conditions of the BSD License
+*  which accompanies this distribution.  The full text of the license may be found at
+*  http://opensource.org/licenses/bsd-license.php
+*
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+*
+**/
+
+
+#ifndef __PL031_REAL_TIME_CLOCK_H__
+#define __PL031_REAL_TIME_CLOCK_H__
+
+// PL031 Registers
+#define PL031_RTC_DR_DATA_REGISTER                      0x000
+#define PL031_RTC_MR_MATCH_REGISTER                     0x004
+#define PL031_RTC_LR_LOAD_REGISTER                      0x008
+#define PL031_RTC_CR_CONTROL_REGISTER                   0x00C
+#define PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER      0x010
+#define PL031_RTC_RIS_RAW_IRQ_STATUS_REGISTER           0x014
+#define PL031_RTC_MIS_MASKED_IRQ_STATUS_REGISTER        0x018
+#define PL031_RTC_ICR_IRQ_CLEAR_REGISTER                0x01C
+#define PL031_RTC_PERIPH_ID0                            0xFE0
+#define PL031_RTC_PERIPH_ID1                            0xFE4
+#define PL031_RTC_PERIPH_ID2                            0xFE8
+#define PL031_RTC_PERIPH_ID3                            0xFEC
+#define PL031_RTC_PCELL_ID0                             0xFF0
+#define PL031_RTC_PCELL_ID1                             0xFF4
+#define PL031_RTC_PCELL_ID2                             0xFF8
+#define PL031_RTC_PCELL_ID3                             0xFFC
+
+// PL031 Values
+#define PL031_RTC_ENABLED                               0x00000001
+#define PL031_SET_IRQ_MASK                              0x00000001
+#define PL031_IRQ_TRIGGERED                             0x00000001
+#define PL031_CLEAR_IRQ                                 0x00000001
+
+#define PL031_COUNTS_PER_SECOND                         1
+
+#endif
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;