summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2021-08-10 09:34:32 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2021-12-08 17:25:16 +0100
commit57b510f1651029a7d539164aede62b18f274b07e (patch)
treeda7f602bb1d650c8e9ca482c4da1c671ffb1c5d9
parent15541316b76036cb46499c921f05f04b9d0105c6 (diff)
bsp/leon3: Enable up-counter conditionally
-rw-r--r--bsps/sparc/leon3/clock/ckinit.c5
-rw-r--r--bsps/sparc/leon3/start/cpucounter.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/bsps/sparc/leon3/clock/ckinit.c b/bsps/sparc/leon3/clock/ckinit.c
index 1750fc1972..7b2ef261bb 100644
--- a/bsps/sparc/leon3/clock/ckinit.c
+++ b/bsps/sparc/leon3/clock/ckinit.c
@@ -274,12 +274,13 @@ static void leon3_clock_initialize(void)
tc->tc_counter_mask = 0xffffffff;
tc->tc_quality = RTEMS_TIMECOUNTER_QUALITY_CLOCK_DRIVER;
- leon3_up_counter_enable();
-
#if defined(LEON3_HAS_ASR_22_23_UP_COUNTER)
+ leon3_up_counter_enable();
leon3_clock_use_up_counter(tc);
#else /* LEON3_HAS_ASR_22_23_UP_COUNTER */
#if defined(LEON3_PROBE_ASR_22_23_UP_COUNTER)
+ leon3_up_counter_enable();
+
if (leon3_up_counter_is_available()) {
/* Use the LEON4 up-counter if available */
leon3_clock_use_up_counter(tc);
diff --git a/bsps/sparc/leon3/start/cpucounter.c b/bsps/sparc/leon3/start/cpucounter.c
index d67c133074..68faf9b940 100644
--- a/bsps/sparc/leon3/start/cpucounter.c
+++ b/bsps/sparc/leon3/start/cpucounter.c
@@ -96,12 +96,13 @@ static void leon3_counter_initialize(void)
counter = &_SPARC_Counter_mutable;
- leon3_up_counter_enable();
-
#if defined(LEON3_HAS_ASR_22_23_UP_COUNTER)
+ leon3_up_counter_enable();
leon3_counter_use_up_counter(counter);
#else /* LEON3_HAS_ASR_22_23_UP_COUNTER */
#if defined(LEON3_PROBE_ASR_22_23_UP_COUNTER)
+ leon3_up_counter_enable();
+
if (leon3_up_counter_is_available()) {
/* Use the LEON4 up-counter if available */
leon3_counter_use_up_counter(counter);