diff options
-rw-r--r-- | bsps/powerpc/shared/dev/clock-ppc-dec.c (renamed from c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/Makefile.am | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex5/Makefile.am | 3 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/Makefile.am | 15 |
8 files changed, 8 insertions, 25 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c b/bsps/powerpc/shared/dev/clock-ppc-dec.c index c9bb16c451..c9bb16c451 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c +++ b/bsps/powerpc/shared/dev/clock-ppc-dec.c diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am index a37ecb440e..08bec33bb7 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am +++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am @@ -164,14 +164,14 @@ endif libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ - ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel if HAS_NETWORKING libbsp_a_LIBADD += network_support.rel \ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index be7243557b..aa27a39c72 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -115,6 +115,7 @@ endif endif libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c @@ -123,7 +124,6 @@ libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c libbsp_a_LIBADD = \ polledIO.rel \ - ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel EXTRA_DIST += BOOTING README.mtx603e README.MVME2100 README.MVME2300 \ diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am index 4804344184..def3b930a9 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am @@ -106,12 +106,11 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/clock.rel - if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index f92725852e..1ad78e0776 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -84,6 +84,7 @@ project_lib_DATA += linkcmds dist_project_lib_DATA += ../shared/startup/linkcmds.share libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c @@ -91,7 +92,6 @@ libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c libbsp_a_LIBADD = \ - ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel if HAS_NETWORKING diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index d620efaadd..2192daba95 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -61,14 +61,14 @@ libbsp_a_SOURCES += network/if_sim.c endif libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ - ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am index 89c7b9b5d6..373e48cca3 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am @@ -48,10 +48,9 @@ libbsp_a_SOURCES += irq/irq_init.c libbsp_a_SOURCES += mmu/mmu.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/clock.rel - EXTRA_DIST += times include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index f61524f496..1c15f2cc59 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -40,13 +40,6 @@ if ppc405 endif # ppc405 if mpc6xx - -# mpc6xx/clock -noinst_PROGRAMS += mpc6xx/clock.rel -mpc6xx_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h -mpc6xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -mpc6xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - # mpc6xx/altivec noinst_PROGRAMS += mpc6xx/altivec.rel mpc6xx_altivec_rel_SOURCES = mpc6xx/altivec/vec_sup.c mpc6xx/altivec/vec_sup_asm.S @@ -55,12 +48,4 @@ mpc6xx_altivec_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif EXTRA_DIST += mpc6xx/altivec/README -# e500/clock -if e500_clock -noinst_PROGRAMS += e500/clock.rel -e500_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h -e500_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -e500_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -endif - include $(top_srcdir)/../../../automake/local.am |