From f3a51d62e9de411d40a798144d07ad5a155f4ed3 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 21 Mar 2018 08:11:33 +0100 Subject: bsps/powerpc: Remove bsp_timer_internal_clock The only consumer of this variable was the ppc403 clock driver used by the * haleakala, * virtex, and * virtex4 BSPs which set bsp_timer_internal_clock unconditionally to true. Update #3285. --- c/src/lib/libcpu/powerpc/ppc403/clock/clock.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libcpu/powerpc/ppc403/clock/clock.c') diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c index 6ae72a223f..64e6f29d39 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c +++ b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c @@ -53,7 +53,6 @@ #include extern uint32_t bsp_clicks_per_usec; -extern bool bsp_timer_internal_clock; volatile uint32_t Clock_driver_ticks; static uint32_t pit_value, tick_time; @@ -171,11 +170,7 @@ static void ClockOn(const rtems_irq_connect_data* unused) #ifndef ppc405 /* this is a ppc403 */ __asm__ volatile ("mfdcr %0, 0xa0" : "=r" (iocr)); /* IOCR */ - if (bsp_timer_internal_clock) { - iocr &= ~4; /* timer clocked from system clock */ - } else { - iocr |= 4; /* select external timer clock */ - } + iocr &= ~4; /* timer clocked from system clock */ __asm__ volatile ("mtdcr 0xa0, %0" : "=r" (iocr) : "0" (iocr)); /* IOCR */ __asm__ volatile ("mfspr %0, 0x11f" : "=r" ((pvr))); /* PVR */ @@ -194,11 +189,7 @@ static void ClockOn(const rtems_irq_connect_data* unused) #else /* ppc405 */ __asm__ volatile ("mfdcr %0, 0x0b2" : "=r" (iocr)); /*405GP CPC0_CR1 */ - if (bsp_timer_internal_clock) { - iocr &=~0x800000; /* timer clocked from system clock CETE*/ - } else { - iocr |= 0x800000; /* select external timer clock CETE*/ - } + iocr &=~0x800000; /* timer clocked from system clock CETE*/ __asm__ volatile ("mtdcr 0x0b2, %0" : "=r" (iocr) : "0" (iocr)); /* 405GP CPC0_CR1 */ /* -- cgit v1.2.3