summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-03-26 12:23:22 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-03-26 15:12:49 +0200
commitddf3ea2bc3e4c60c4daa215a0f275a098ea9e59d (patch)
treeba54afe266a84e713a6189f48446e5955e701fd8
parentbsps/mcf5206elite: Move libcpu content to bsps (diff)
downloadrtems-ddf3ea2bc3e4c60c4daa215a0f275a098ea9e59d.tar.bz2
bsps/csb360: Move libcpu content to bsps
This patch is a part of the BSP source reorganization. Update #3285.
-rw-r--r--bsps/m68k/csb360/dev/ckinit.c (renamed from c/src/lib/libcpu/m68k/mcf5272/clock/ckinit.c)0
-rw-r--r--bsps/m68k/csb360/dev/timer.c (renamed from c/src/lib/libcpu/m68k/mcf5272/timer/timer.c)0
-rw-r--r--bsps/m68k/csb360/dev/timerisr.S (renamed from c/src/lib/libcpu/m68k/mcf5272/timer/timerisr.S)0
-rw-r--r--c/src/lib/libbsp/m68k/csb360/Makefile.am7
-rw-r--r--c/src/lib/libcpu/m68k/Makefile.am15
5 files changed, 3 insertions, 19 deletions
diff --git a/c/src/lib/libcpu/m68k/mcf5272/clock/ckinit.c b/bsps/m68k/csb360/dev/ckinit.c
index 3b7b25067c..3b7b25067c 100644
--- a/c/src/lib/libcpu/m68k/mcf5272/clock/ckinit.c
+++ b/bsps/m68k/csb360/dev/ckinit.c
diff --git a/c/src/lib/libcpu/m68k/mcf5272/timer/timer.c b/bsps/m68k/csb360/dev/timer.c
index 812310fbea..812310fbea 100644
--- a/c/src/lib/libcpu/m68k/mcf5272/timer/timer.c
+++ b/bsps/m68k/csb360/dev/timer.c
diff --git a/c/src/lib/libcpu/m68k/mcf5272/timer/timerisr.S b/bsps/m68k/csb360/dev/timerisr.S
index b9c28921c4..b9c28921c4 100644
--- a/c/src/lib/libcpu/m68k/mcf5272/timer/timerisr.S
+++ b/bsps/m68k/csb360/dev/timerisr.S
diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am
index 6670638207..a471d6c2e7 100644
--- a/c/src/lib/libbsp/m68k/csb360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am
@@ -35,11 +35,10 @@ libbsp_a_SOURCES += console/console-io.c ../../shared/console-polled.c
libbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
libbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/csb360/dev/ckinit.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/csb360/dev/timer.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/csb360/dev/timerisr.S
libbsp_a_SOURCES += ../../../../../../bsps/m68k/csb360/start/idle-mcf5272.c
-libbsp_a_LIBADD = \
- ../../../libcpu/@RTEMS_CPU@/mcf5272/clock.rel \
- ../../../libcpu/@RTEMS_CPU@/mcf5272/timer.rel
-
include $(top_srcdir)/../../../../automake/local.am
include $(srcdir)/../../../../../../bsps/m68k/csb360/headers.am
diff --git a/c/src/lib/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am
index 50cc126be0..8a2414f09a 100644
--- a/c/src/lib/libcpu/m68k/Makefile.am
+++ b/c/src/lib/libcpu/m68k/Makefile.am
@@ -4,21 +4,6 @@ include $(top_srcdir)/../../../automake/compile.am
noinst_PROGRAMS =
-if mcf5272
-## mcf5272/include
-## clock
-noinst_PROGRAMS += mcf5272/clock.rel
-mcf5272_clock_rel_SOURCES = mcf5272/clock/ckinit.c
-mcf5272_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mcf5272_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## timer
-noinst_PROGRAMS += mcf5272/timer.rel
-mcf5272_timer_rel_SOURCES = mcf5272/timer/timer.c mcf5272/timer/timerisr.S
-mcf5272_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mcf5272_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
if mcf548x
## mcf548x/include
## mcf548x/mcdma