diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-06-21 17:17:28 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-06-24 10:54:01 +0200 |
| commit | e916b1258c34f13ddcfa1f297bbb41d118638473 (patch) | |
| tree | 45316a97f3fa146f569fa7f01ba2d67fa915cb6e | |
| parent | bsp/virtex: Add console devices only if present (diff) | |
| download | rtems-e916b1258c34f13ddcfa1f297bbb41d118638473.tar.bz2 | |
bsp/virtex: Use shared clock driver
| -rw-r--r-- | c/src/lib/libbsp/powerpc/virtex/Makefile.am | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/virtex/include/bsp.h | 2 | ||||
| -rw-r--r-- | 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 cb12e32c67..92741fec4e 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 c5d8d504cd..69d9c6be7d 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 e396bf1228..c2bedbe478 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( |