summaryrefslogtreecommitdiff
path: root/drivers/delay_timer
diff options
context:
space:
mode:
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>2019-02-06 09:23:04 +0000
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>2019-02-06 09:54:42 +0000
commit29a24134c170af1cda1b59e5f47071c8353ce3b9 (patch)
tree4830fd15df3426b973522bc040e0ec69131c7c5b /drivers/delay_timer
parenta45ccf135e48efc70006055c32e8a89fddb38db2 (diff)
downloadarm-trusted-firmware-29a24134c170af1cda1b59e5f47071c8353ce3b9.tar.gz
drivers: generic_delay_timer: Assert presence of Generic Timer
The Generic Timer is an optional extension to an ARMv7-A implementation. The generic delay timer can be used from any architecture supported by the Trusted Firmware. In ARMv7 it is needed to check that this feature is present. In ARMv8 it is always present. Change-Id: Ib7e8ec13ffbb2f64445d4ee48ed00f26e34b79b7 Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'drivers/delay_timer')
-rw-r--r--drivers/delay_timer/generic_delay_timer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/delay_timer/generic_delay_timer.c b/drivers/delay_timer/generic_delay_timer.c
index 4b67ed0d1..3d0a11f59 100644
--- a/drivers/delay_timer/generic_delay_timer.c
+++ b/drivers/delay_timer/generic_delay_timer.c
@@ -1,11 +1,12 @@
/*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <assert.h>
+#include <arch_features.h>
#include <arch_helpers.h>
#include <common/bl_common.h>
#include <common/debug.h>
@@ -43,6 +44,8 @@ void generic_delay_timer_init_args(uint32_t mult, uint32_t div)
void generic_delay_timer_init(void)
{
+ assert(is_armv7_gentimer_present());
+
/* Value in ticks */
unsigned int mult = MHZ_TICKS_PER_SEC;