From ddf3ea2bc3e4c60c4daa215a0f275a098ea9e59d Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 26 Mar 2018 12:23:22 +0200 Subject: [PATCH] bsps/csb360: Move libcpu content to bsps This patch is a part of the BSP source reorganization. Update #3285. --- .../clock => bsps/m68k/csb360/dev}/ckinit.c | 0 .../timer => bsps/m68k/csb360/dev}/timer.c | 0 .../timer => bsps/m68k/csb360/dev}/timerisr.S | 0 c/src/lib/libbsp/m68k/csb360/Makefile.am | 7 +++---- c/src/lib/libcpu/m68k/Makefile.am | 15 --------------- 5 files changed, 3 insertions(+), 19 deletions(-) rename {c/src/lib/libcpu/m68k/mcf5272/clock => bsps/m68k/csb360/dev}/ckinit.c (100%) rename {c/src/lib/libcpu/m68k/mcf5272/timer => bsps/m68k/csb360/dev}/timer.c (100%) rename {c/src/lib/libcpu/m68k/mcf5272/timer => bsps/m68k/csb360/dev}/timerisr.S (100%) diff --git a/c/src/lib/libcpu/m68k/mcf5272/clock/ckinit.c b/bsps/m68k/csb360/dev/ckinit.c similarity index 100% rename from c/src/lib/libcpu/m68k/mcf5272/clock/ckinit.c rename to 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 similarity index 100% rename from c/src/lib/libcpu/m68k/mcf5272/timer/timer.c rename to 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 similarity index 100% rename from c/src/lib/libcpu/m68k/mcf5272/timer/timerisr.S rename to 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