diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 4ce59f3e1f..c0861140e8 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -314,11 +314,6 @@ gArmTokenSpaceGuid.PcdEmbeddedControllerFirmwareRelease|0xFFFF|UINT16|0x30000059 [PcdsFixedAtBuild.common, PcdsDynamic.common] - # - # ARM Architectural Timer - # - gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0|UINT32|0x00000034 - # ARM Architectural Timer Interrupt(GIC PPI) numbers gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|29|UINT32|0x00000035 gArmTokenSpaceGuid.PcdArmArchTimerIntrNum|30|UINT32|0x00000036 diff --git a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c index 00700395ef..ccb4f6474b 100644 --- a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c +++ b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c @@ -15,7 +15,7 @@ #include #include -#define TICKS_PER_MICRO_SEC (PcdGet32 (PcdArmArchTimerFreqInHz)/1000000U) +#define TICKS_PER_MICRO_SEC (ArmGenericTimerGetTimerFreq ()/1000000U) // Select appropriate multiply function for platform architecture. #ifdef MDE_CPU_ARM @@ -34,19 +34,6 @@ TimerConstructor ( // Check if the ARM Generic Timer Extension is implemented. // if (ArmIsArchTimerImplemented ()) { - // - // Check if Architectural Timer frequency is pre-determined by the platform - // (ie. nonzero). - // - if (PcdGet32 (PcdArmArchTimerFreqInHz) != 0) { - // - // Check if ticks/uS is not 0. The Architectural timer runs at constant - // frequency, irrespective of CPU frequency. According to Generic Timer - // Ref manual, lower bound of the frequency is in the range of 1-10MHz. - // - ASSERT (TICKS_PER_MICRO_SEC); - } - // // Architectural Timer Frequency must be set in Secure privileged // mode (if secure extension is supported). @@ -76,10 +63,7 @@ GetPlatformTimerFreq ( { UINTN TimerFreq; - TimerFreq = PcdGet32 (PcdArmArchTimerFreqInHz); - if (TimerFreq == 0) { - TimerFreq = ArmGenericTimerGetTimerFreq (); - } + TimerFreq = ArmGenericTimerGetTimerFreq (); return TimerFreq; } diff --git a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf index 6f576ceab9..273b1e9555 100644 --- a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf +++ b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf @@ -29,4 +29,3 @@ ArmGenericTimerCounterLib [Pcd] - gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz