[rtems commit] bsps/genmcf548x: Move libcpu content to bsps

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    945095d0621757134bdf271fd12622ac16b57431
Changeset: http://git.rtems.org/rtems/commit/?id=945095d0621757134bdf271fd12622ac16b57431

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Mar 26 13:08:07 2018 +0200

bsps/genmcf548x: Move libcpu content to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

---

 .../m68k/mcf548x => bsps/m68k/genmcf548x}/mcdma/MCD_dmaApi.c  |  0
 .../m68k/mcf548x => bsps/m68k/genmcf548x}/mcdma/MCD_tasks.c   |  0
 .../mcf548x => bsps/m68k/genmcf548x}/mcdma/MCD_tasksInit.c    |  0
 .../mcf548x => bsps/m68k/genmcf548x}/mcdma/ReleaseNotes.txt   |  0
 .../m68k/mcf548x => bsps/m68k/genmcf548x}/mcdma/mcdma_glue.c  |  0
 c/src/lib/libbsp/m68k/genmcf548x/Makefile.am                  |  8 +++++---
 c/src/lib/libcpu/m68k/Makefile.am                             | 11 -----------
 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
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dmaApi.c
rename to 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
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasks.c
rename to 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
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.c
rename to 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
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf548x/mcdma/ReleaseNotes.txt
rename to 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
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.c
rename to 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 72fb216..6677c36 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 8a2414f..afbe9ca 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