[rtems commit] bsp/virtex: Use shared clock driver

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    e916b1258c34f13ddcfa1f297bbb41d118638473
Changeset: http://git.rtems.org/rtems/commit/?id=e916b1258c34f13ddcfa1f297bbb41d118638473

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Jun 21 17:17:28 2013 +0200

bsp/virtex: Use shared clock driver

---

 c/src/lib/libbsp/powerpc/virtex/Makefile.am        |    6 ++++--
 c/src/lib/libbsp/powerpc/virtex/include/bsp.h      |    2 --
 c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c |    9 +--------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index cb12e32..92741fe 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -67,6 +67,9 @@ libbsp_a_SOURCES += ../../shared/src/irq-server.c
 libbsp_a_SOURCES += ../../shared/src/irq-shell.c
 libbsp_a_SOURCES += irq/irq_init.c
 
+# clock
+libbsp_a_SOURCES += ../shared/clock/clock.c
+
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 network_CPPFLAGS += -D__BSD_VISIBLE
@@ -84,8 +87,7 @@ libbsp_a_LIBADD += \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
-    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
-    ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel
+    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel
 
 if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h b/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
index c5d8d50..69d9c6b 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
@@ -78,8 +78,6 @@ extern bool bsp_timer_internal_clock;   /* TRUE, when timer runs with CPU clk */
 extern xilTemac_driver_attach(struct rtems_bsdnet_ifconfig*, int );
 #define RTEMS_BSP_NETWORK_DRIVER_ATTACH xilTemac_driver_attach
 
-#define BSP_PPC403_CLOCK_HOOK_EXCEPTION ASM_BOOKE_DEC_VECTOR
-
 #endif /* ASM */
 
 #ifdef __cplusplus
diff --git a/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c b/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c
index e396bf1..c2bedbe 100644
--- a/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c
@@ -70,7 +70,7 @@ LINKER_SYMBOL(virtex_exc_vector_base);
 /*
  *  Driver configuration parameters
  */
-uint32_t   bsp_clicks_per_usec;
+uint32_t bsp_time_base_frequency = XPAR_CPU_PPC405_CORE_CLOCK_FREQ_HZ;
 
 /*
  *  bsp_start
@@ -88,13 +88,6 @@ void bsp_start( void )
   get_ppc_cpu_revision();
 
   /*
-   *  initialize the device driver parameters
-   */
-
-  /* timebase register ticks/microsecond */
-  bsp_clicks_per_usec = (250000000 / 1000000);
-
-  /*
    * Initialize default raw exception handlers.
    */
   ppc_exc_initialize_with_vector_base(