bsps/genmcf548x: Move libcpu content to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

7 files changed, 5 insertions, 14 deletions

diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dmaApi.c b/bsps/m68k/genmcf548x/mcdma/MCD_dmaApi.c
index 2012672083..2012672083 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dmaApi.c
+++ b/bsps/m68k/genmcf548x/mcdma/MCD_dmaApi.c
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasks.c b/bsps/m68k/genmcf548x/mcdma/MCD_tasks.c
index 2148a06665..2148a06665 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasks.c
+++ b/bsps/m68k/genmcf548x/mcdma/MCD_tasks.c
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.c b/bsps/m68k/genmcf548x/mcdma/MCD_tasksInit.c
index 314d413b4a..314d413b4a 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.c
+++ b/bsps/m68k/genmcf548x/mcdma/MCD_tasksInit.c
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/ReleaseNotes.txt b/bsps/m68k/genmcf548x/mcdma/ReleaseNotes.txt
index 12eb03cff9..12eb03cff9 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/ReleaseNotes.txt
+++ b/bsps/m68k/genmcf548x/mcdma/ReleaseNotes.txt
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.c b/bsps/m68k/genmcf548x/mcdma/mcdma_glue.c
index d3d6115143..d3d6115143 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.c
+++ b/bsps/m68k/genmcf548x/mcdma/mcdma_glue.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index 72fb216067..6677c36ac2 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -48,15 +48,17 @@ libbsp_a_SOURCES += ../../shared/src/irq-shell.c
 libbsp_a_SOURCES += irq/irq.c
 libbsp_a_SOURCES += irq/intc-icr-init-values.c
 
-libbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/start/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 libbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/mcdma/MCD_dmaApi.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/mcdma/MCD_tasks.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/mcdma/MCD_tasksInit.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/mcdma/mcdma_glue.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/start/cache.c
 
 if HAS_NETWORKING
 libbsp_a_SOURCES += network/network.c
 endif
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mcf548x/mcdma.rel
-
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/m68k/genmcf548x/headers.am
diff --git a/c/src/lib/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am
index 8a2414f09a..afbe9caf9c 100644
--- a/c/src/lib/libcpu/m68k/Makefile.am
+++ b/c/src/lib/libcpu/m68k/Makefile.am
@@ -4,15 +4,4 @@ include $(top_srcdir)/../../../automake/compile.am
 
 noinst_PROGRAMS =
 
-if mcf548x
-## mcf548x/include
-## mcf548x/mcdma
-noinst_PROGRAMS += mcf548x/mcdma.rel
-mcf548x_mcdma_rel_SOURCES = mcf548x/mcdma/MCD_dmaApi.c mcf548x/mcdma/MCD_tasksInit.c \
-                            mcf548x/mcdma/MCD_tasks.c  mcf548x/mcdma/mcdma_glue.c
-
-mcf548x_mcdma_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mcf548x_mcdma_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
 include $(top_srcdir)/../../../automake/local.am