summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-03-26 07:43:09 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-03-26 10:40:49 +0200
commit2d33672a1844d104cd2a2328dac8e7a06ab28ace (patch)
tree14d3cbd263ef07c5cccb958c94b40e2c1b8f3fb7
parentbsps/powerpc: Remove unused files (diff)
downloadrtems-2d33672a1844d104cd2a2328dac8e7a06ab28ace.tar.bz2
bsps/powerpc: Move ppc403 clock driver to bsps
This patch is a part of the BSP source reorganization. Update #3285.
-rw-r--r--bsps/powerpc/shared/dev/clock-ppc403.c (renamed from c/src/lib/libcpu/powerpc/ppc403/clock/clock.c)0
-rw-r--r--c/src/lib/libbsp/powerpc/haleakala/Makefile.am3
-rw-r--r--c/src/lib/libbsp/powerpc/virtex4/Makefile.am3
-rw-r--r--c/src/lib/libcpu/powerpc/Makefile.am33
4 files changed, 2 insertions, 37 deletions
diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c b/bsps/powerpc/shared/dev/clock-ppc403.c
index 64e6f29d39..64e6f29d39 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c
+++ b/bsps/powerpc/shared/dev/clock-ppc403.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index b461f23058..592c68e235 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -43,11 +43,10 @@ libbsp_a_SOURCES += network/network.c
endif
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc403.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@/ppc403/clock.rel
-
include $(top_srcdir)/../../../../automake/local.am
include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index fe1adc7847..33a89dba5a 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -46,10 +46,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-ppc403.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/ppc403/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 9d19f0e13d..469a518de5 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -6,37 +6,4 @@ EXTRA_DIST =
noinst_PROGRAMS =
-EXTRA_DIST += ppc403/README ppc403/vectors/README
-if ppc4xx
-# ppc403/clock
-noinst_PROGRAMS += ppc403/clock.rel
-ppc403_clock_rel_SOURCES = ppc403/clock/clock.c
-ppc403_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-ppc403_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# ppc403/console
-noinst_PROGRAMS += ppc403/console.rel
-if ppc405
-ppc403_console_rel_SOURCES = ppc403/console/console405.c
-else
-ppc403_console_rel_SOURCES = ppc403/console/console.c
-endif
-ppc403_console_rel_CPPFLAGS = $(AM_CPPFLAGS)
-ppc403_console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# ppc403/tty_drv
-if ppc405
-noinst_PROGRAMS += ppc403/tty_drv.rel
-ppc403_tty_drv_rel_SOURCES = ppc403/tty_drv/tty_drv.c ppc403/tty_drv/tty_drv.h
-ppc403_tty_drv_rel_CPPFLAGS = $(AM_CPPFLAGS)
-ppc403_tty_drv_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-endif # ppc4xx
-
-if ppc405
-
-## ppc4xx/include
-endif # ppc405
-
include $(top_srcdir)/../../../automake/local.am