diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 13:38:29 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:46:33 +0000 |
| commit | 886a1815625b5539c32efc0d601541d44a0b2410 (patch) | |
| tree | 43113e2805705349d45584b47d5f3ccae0b7159d /common/timer.c | |
| parent | 2ad60571844d6668ca8199e402db46d34adf3ee0 (diff) | |
| download | chrome-ec-886a1815625b5539c32efc0d601541d44a0b2410.tar.gz | |
Revert "common: change clksrc_high to use STATIC_IF_NOT"
This reverts commit 7451ab9eb90b8042d01ca0b68f5a0fef63a7e96c.
BUG=b:200823466
TEST=make buildall -j
Change-Id: Ib87cd7aa135304567070b3f3b2a19441affa126f
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273362
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'common/timer.c')
| -rw-r--r-- | common/timer.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/common/timer.c b/common/timer.c index 843588f980..b43ff265ee 100644 --- a/common/timer.c +++ b/common/timer.c @@ -17,8 +17,16 @@ #define TIMER_SYSJUMP_TAG 0x4d54 /* "TM" */ -/* High 32-bits of the 64-bit timestamp counter. */ -STATIC_IF_NOT(CONFIG_HWTIMER_64BIT) uint32_t clksrc_high; +/* + * High word of the 64-bit timestamp counter. Not used if + * CONFIG_HWTIMER_64BIT is enabled. + */ +#ifdef CONFIG_HWTIMER_64BIT +/* Declaring as extern will cause linker errors if used */ +extern uint32_t clksrc_high; +#else +static volatile uint32_t clksrc_high; +#endif /* CONFIG_HWTIMER_64BIT */ /* Bitmap of currently running timers */ static uint32_t timer_running; |