ArmPlatformPkg: Fix builds
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11964 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -12,8 +12,6 @@
|
||||
**/
|
||||
|
||||
#include <PiDxe.h>
|
||||
#include <Library/PcdLib.h>
|
||||
#include <Library/DebugLib.h>
|
||||
#include <Library/BaseMemoryLib.h>
|
||||
#include <Library/DevicePathLib.h>
|
||||
#include <Library/UefiBootServicesTableLib.h>
|
||||
|
@@ -12,7 +12,6 @@
|
||||
**/
|
||||
|
||||
#include <PiDxe.h>
|
||||
#include <Library/PcdLib.h>
|
||||
#include <Library/BaseMemoryLib.h>
|
||||
#include <Library/DevicePathLib.h>
|
||||
#include <Library/UefiBootServicesTableLib.h>
|
||||
|
@@ -16,10 +16,14 @@
|
||||
|
||||
|
||||
#include <Base.h>
|
||||
|
||||
#include <Library/DebugLib.h>
|
||||
#include <Library/LcdPlatformLib.h>
|
||||
#include <Library/PcdLib.h>
|
||||
#include <Library/UefiLib.h>
|
||||
|
||||
#include <Protocol/DevicePath.h>
|
||||
|
||||
#include <Library/LcdPlatformLib.h>
|
||||
|
||||
//
|
||||
// Device structures
|
||||
|
@@ -11,11 +11,8 @@
|
||||
|
||||
**/
|
||||
|
||||
#include <Library/DebugLib.h>
|
||||
#include <Library/IoLib.h>
|
||||
#include <Library/LcdPlatformLib.h>
|
||||
#include <Library/MemoryAllocationLib.h>
|
||||
#include <Library/PcdLib.h>
|
||||
|
||||
#include <Drivers/PL111Lcd.h>
|
||||
|
||||
|
@@ -48,6 +48,6 @@ ASM_PFX(PL35xSmcInitialize):
|
||||
str r0, [r1, #PL350_SMC_DIRECT_CMD_OFFSET]
|
||||
|
||||
add r2, #0xC
|
||||
b ASM_PFX(PL350SmcInitialize)
|
||||
b ASM_PFX(PL35xSmcInitialize)
|
||||
|
||||
ASM_FUNCTION_REMOVE_IF_UNREFERENCED
|
@@ -282,10 +282,10 @@ SP805SetTimerPeriod (
|
||||
//
|
||||
// WatchdogTicks = (TimerPeriod * SP805_CLOCK_FREQUENCY) / 20 MHz ;
|
||||
|
||||
Ticks64bit = DivU64x32( MultU64x32( TimerPeriod, SP805_CLOCK_FREQUENCY ), 20000000 );
|
||||
Ticks64bit = DivU64x32(MultU64x32(TimerPeriod, (UINTN)PcdGet32(PcdSP805WatchdogClockFrequencyInHz)), 20000000);
|
||||
|
||||
// The registers in the SP805 are only 32 bits
|
||||
if( Ticks64bit > SP805_MAX_TICKS ) {
|
||||
if(Ticks64bit > (UINT64)0xFFFFFFFF) {
|
||||
// We could load the watchdog with the maximum supported value but
|
||||
// if a smaller value was requested, this could have the watchdog
|
||||
// triggering before it was intended.
|
||||
|
Reference in New Issue
Block a user