2 files changed, 1 insertions, 40 deletions
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
index 003c91780c..792af31c3a 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5225x/clock/clock.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5225x/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5225x/console/debugio.c
-librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5225x/btimer/btimer.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache-mcf5225x.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c
deleted file mode 100644
index ac0ca6d7d0..0000000000
--- a/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Timer Init
- *
- *  Use the last DMA timer (DTIM3) as the diagnostic timer.
- *
- *  Author: W. Eric Norum <norume@aps.anl.gov>
- *
- *  COPYRIGHT (c) 2005-2010.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#include <rtems.h>
-#include <rtems/btimer.h>
-#include <bsp.h>
-
-void benchmark_timer_initialize(void)
-{
-  uint32_t preScaleDivisor = bsp_get_CPU_clock_speed() / 1000000;
-
-  MCF_DTIM3_DTMR = 0;
-  MCF_DTIM3_DTMR = MCF_DTIM_DTMR_PS(preScaleDivisor - 1) |
-    MCF_DTIM_DTMR_CLK_DIV1 | MCF_DTIM_DTMR_RST;
-}
-
-/*
- * Return timer value in microsecond units
- */
-benchmark_timer_t benchmark_timer_read(void)
-{
-  return MCF_DTIM3_DTCN;
-}
-
-void benchmark_timer_disable_subtracting_average_overhead(bool find_flag)
-{
-}