diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-08-10 09:34:32 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-08-10 09:34:32 +0200 |
commit | 103b160b1646f2523ca859dfdfd16bc0cf40ed5a (patch) | |
tree | 36325b4b5164a16c3d05fe9739e0090fff71b8d9 | |
parent | cd96f66c5f4f62853840d383136fe94b96794ac2 (diff) |
bsp/leon3: Enable up-counter conditionally
-rw-r--r-- | bsps/sparc/leon3/clock/ckinit.c | 5 | ||||
-rw-r--r-- | bsps/sparc/leon3/start/cpucounter.c | 5 |
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); |