[rtems commit] bsp/tqm8xx: Move libcpu content to bsps

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Mar 23 16:11:55 2018 +0100

bsp/tqm8xx: Move libcpu content to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

---

 .../clock => bsps/powerpc/tqm8xx/dev}/clock.c      |  0
 .../powerpc/tqm8xx/dev}/console-generic.c          |  0
 .../mpc8xx/cpm => bsps/powerpc/tqm8xx/start}/cp.c  |  0
 .../cpm => bsps/powerpc/tqm8xx/start}/dpram.c      |  0
 .../mpc8xx/mmu => bsps/powerpc/tqm8xx/start}/mmu.c |  0
 c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am        | 10 ++++----
 c/src/lib/libcpu/powerpc/Makefile.am               | 27 ----------------------
 c/src/lib/libcpu/powerpc/mpc8xx/README             | 15 ------------
 8 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c b/bsps/powerpc/tqm8xx/dev/clock.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c
rename to bsps/powerpc/tqm8xx/dev/clock.c
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c b/bsps/powerpc/tqm8xx/dev/console-generic.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c
rename to bsps/powerpc/tqm8xx/dev/console-generic.c
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/cp.c b/bsps/powerpc/tqm8xx/start/cp.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8xx/cpm/cp.c
rename to bsps/powerpc/tqm8xx/start/cp.c
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c b/bsps/powerpc/tqm8xx/start/dpram.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c
rename to bsps/powerpc/tqm8xx/start/dpram.c
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/mmu.c b/bsps/powerpc/tqm8xx/start/mmu.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8xx/mmu/mmu.c
rename to bsps/powerpc/tqm8xx/start/mmu.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index f04ed45..f7ec310 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -64,12 +64,10 @@ endif
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
-
-libbsp_a_LIBADD = \
-    ../../../libcpu/@RTEMS_CPU@/mpc8xx/console-generic.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc8xx/cpm.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc8xx/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc8xx/mmu.rel
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/dev/console-generic.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/cp.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/dpram.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/mmu.c
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index c7d5f16..5f5813d 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -79,31 +79,4 @@ e500_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
 e500_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-EXTRA_DIST += mpc8xx/README
-if mpc8xx
-# mpc8xx/clock
-noinst_PROGRAMS += mpc8xx/clock.rel
-mpc8xx_clock_rel_SOURCES = mpc8xx/clock/clock.c
-mpc8xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# mpc8xx/console-generic
-noinst_PROGRAMS += mpc8xx/console-generic.rel
-mpc8xx_console_generic_rel_SOURCES = mpc8xx/console-generic/console-generic.c
-mpc8xx_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8xx_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# mpc8xx/cpm
-noinst_PROGRAMS += mpc8xx/cpm.rel
-mpc8xx_cpm_rel_SOURCES = mpc8xx/cpm/cp.c mpc8xx/cpm/dpram.c
-mpc8xx_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8xx_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# mpc8xx/mmu
-noinst_PROGRAMS += mpc8xx/mmu.rel
-mpc8xx_mmu_rel_SOURCES = mpc8xx/mmu/mmu.c
-mpc8xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8xx_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/README b/c/src/lib/libcpu/powerpc/mpc8xx/README
deleted file mode 100644
index 3d852d0..0000000
--- a/c/src/lib/libcpu/powerpc/mpc8xx/README
+++ /dev/null
@@ -1,15 +0,0 @@
-Various non BSP dependant support routines.
-
-clock - Uses the MPC860/MPC821 PIT (Programmable interval timer) to
-	generate RTEMS clock ticks.
-
-console_generic - Uses the MPC860/MPC821 SCCs and SMCs to to serial I/O.
-
-include - console.h: function declarations for console related functions
-
-timer - Uses the MPC860/MPC821 timebase register for timing
-	tests.  It only uses the lower 32 bits
-
-vectors - MPC860/MPC821 specific vector entry points.
-	Includes CPU dependant, application independant
-	handlers: alignment.