bsp/tqm8xx: Move libcpu content to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

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
index 49500fedd1..49500fedd1 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c
+++ b/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
index e015a6497b..e015a6497b 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c
+++ b/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
index de38f0a5df..de38f0a5df 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/cp.c
+++ b/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
index 4f6cb6d94a..4f6cb6d94a 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c
+++ b/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
index 78743c6250..78743c6250 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/mmu.c
+++ b/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 f04ed45748..f7ec310224 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 c7d5f16886..5f5813d350 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 3d852d0785..0000000000
--- 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.