diff options
| author | Zoltan Kiss <zoltan.kiss@huawei.com> | 2014-10-11 16:12:50 +0800 |
|---|---|---|
| committer | Wei Xu <xuwei5@huawei.com> | 2014-12-10 08:33:44 +0800 |
| commit | 3c2466706153f75cdeb3152c05235adec39dfeec (patch) | |
| tree | 3f06b258ccc195e0d6abb749c30466157b1820c9 | |
| parent | 58dadf9d9617c5b17a510a89206df69ddce46e59 (diff) | |
HisiPkg: These two recent changes broke compilation for D01 package:
- [4f6d34b4] ArmPkg: Move TimerDxe and ArmArchTimerLib to new ArmGenericTimerCounterLib
- [d4bb43ce] ArmPkg: Renamed ArmArchTimerLib.h to ArmArchTimer.h
This patch fixes these errors.
Signed-off-by: Zoltan Kiss <zoltan.kiss@huawei.com>
| -rw-r--r-- | HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc | 4 | ||||
| -rw-r--r-- | HisiPkg/D01BoardPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c | 2 | ||||
| -rw-r--r-- | HisiPkg/Drivers/TimerDxe/TimerDxe.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc b/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc index 3a23a44c4..d915c3548 100644 --- a/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc +++ b/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc @@ -109,6 +109,8 @@ # BDS Libraries
BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
+ ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
+
[LibraryClasses.common.SEC]
ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
@@ -211,6 +213,8 @@ # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
#
NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+ # Add support for GCC stack protector
+ NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
[BuildOptions]
RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
diff --git a/HisiPkg/D01BoardPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c b/HisiPkg/D01BoardPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c index 82221cf9a..fc7c23db3 100644 --- a/HisiPkg/D01BoardPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c +++ b/HisiPkg/D01BoardPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c @@ -31,7 +31,7 @@ #include <Protocol/RealTimeClock.h>
#include <Guid/GlobalVariable.h>
#include <Drivers/PL031RealTimeClock.h>
-#include <Library/ArmArchTimerLib.h>
+#include <Library/ArmArchTimer.h>
#include <ArmPlatform.h>
STATIC CONST CHAR16 mTimeZoneVariableName[] = L"PL031RtcTimeZone";
diff --git a/HisiPkg/Drivers/TimerDxe/TimerDxe.c b/HisiPkg/Drivers/TimerDxe/TimerDxe.c index 5854a3656..77bc73c20 100644 --- a/HisiPkg/Drivers/TimerDxe/TimerDxe.c +++ b/HisiPkg/Drivers/TimerDxe/TimerDxe.c @@ -25,7 +25,7 @@ #include <Library/UefiLib.h>
#include <Library/PcdLib.h>
#include <Library/IoLib.h>
-#include <Library/ArmArchTimerLib.h>
+#include <Library/ArmArchTimer.h>
#include <Protocol/Timer.h>
#include <Protocol/HardwareInterrupt.h>
|