From a12dcff877bfe4ee8346b35947efab0aae7806e2 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 23 Mar 2018 16:04:18 +0100 Subject: [PATCH] bsp/mpc8260: Move libcpu content to bsps This patch is a part of the BSP source reorganization. Update #3285. --- .../powerpc/mpc8260ads/dev}/console-generic.c | 0 .../powerpc/mpc8260ads/start}/brg.c | 0 .../powerpc/mpc8260ads/start}/cp.c | 0 .../powerpc/mpc8260ads/start}/dpram.c | 0 .../powerpc/mpc8260ads/start}/mmu.c | 0 .../lib/libbsp/powerpc/mpc8260ads/Makefile.am | 9 +++---- c/src/lib/libcpu/powerpc/Makefile.am | 24 ------------------- c/src/lib/libcpu/powerpc/mpc8260/README | 17 ------------- 8 files changed, 5 insertions(+), 45 deletions(-) rename {c/src/lib/libcpu/powerpc/mpc8260/console-generic => bsps/powerpc/mpc8260ads/dev}/console-generic.c (100%) rename {c/src/lib/libcpu/powerpc/mpc8260/cpm => bsps/powerpc/mpc8260ads/start}/brg.c (100%) rename {c/src/lib/libcpu/powerpc/mpc8260/cpm => bsps/powerpc/mpc8260ads/start}/cp.c (100%) rename {c/src/lib/libcpu/powerpc/mpc8260/cpm => bsps/powerpc/mpc8260ads/start}/dpram.c (100%) rename {c/src/lib/libcpu/powerpc/mpc8260/mmu => bsps/powerpc/mpc8260ads/start}/mmu.c (100%) delete mode 100644 c/src/lib/libcpu/powerpc/mpc8260/README diff --git a/c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c b/bsps/powerpc/mpc8260ads/dev/console-generic.c similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c rename to bsps/powerpc/mpc8260ads/dev/console-generic.c diff --git a/c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c b/bsps/powerpc/mpc8260ads/start/brg.c similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c rename to bsps/powerpc/mpc8260ads/start/brg.c diff --git a/c/src/lib/libcpu/powerpc/mpc8260/cpm/cp.c b/bsps/powerpc/mpc8260ads/start/cp.c similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc8260/cpm/cp.c rename to bsps/powerpc/mpc8260ads/start/cp.c diff --git a/c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c b/bsps/powerpc/mpc8260ads/start/dpram.c similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c rename to bsps/powerpc/mpc8260ads/start/dpram.c diff --git a/c/src/lib/libcpu/powerpc/mpc8260/mmu/mmu.c b/bsps/powerpc/mpc8260ads/start/mmu.c similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc8260/mmu/mmu.c rename to bsps/powerpc/mpc8260ads/start/mmu.c diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index f01305d3c0..cf567f254d 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -56,10 +56,11 @@ 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@/mpc8260/console-generic.rel \ - ../../../libcpu/@RTEMS_CPU@/mpc8260/cpm.rel \ - ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/dev/console-generic.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/brg.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/cp.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/dpram.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/mmu.c EXTRA_DIST += times diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index 6bef20975a..c7d5f16886 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -106,28 +106,4 @@ mpc8xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc8xx_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -EXTRA_DIST += mpc8260/README -if mpc8260 -# mpc8260/console-generic -noinst_PROGRAMS += mpc8260/console-generic.rel -mpc8260_console_generic_rel_SOURCES = mpc8260/console-generic/console-generic.c \ - mpc8260/include/console.h -mpc8260_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS) -mpc8260_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -# mpc8260/cpm -noinst_PROGRAMS += mpc8260/cpm.rel -mpc8260_cpm_rel_SOURCES = mpc8260/cpm/cp.c mpc8260/cpm/dpram.c mpc8260/cpm/brg.c \ - mpc8260/include/cpm.h -mpc8260_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS) -mpc8260_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -# mpc8260/mmu -noinst_PROGRAMS += mpc8260/mmu.rel -mpc8260_mmu_rel_SOURCES = mpc8260/mmu/mmu.c \ - mpc8260/include/mmu.h -mpc8260_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS) -mpc8260_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -endif - include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc8260/README b/c/src/lib/libcpu/powerpc/mpc8260/README deleted file mode 100644 index a5ab97157d..0000000000 --- a/c/src/lib/libcpu/powerpc/mpc8260/README +++ /dev/null @@ -1,17 +0,0 @@ -# Modified from mpc860 version by A. Dachs, 28-4-00 - -Various non BSP dependant support routines. - -clock - Uses the MPC8260 decrementer to - generate RTEMS clock ticks. - -console_generic - Uses the MPC8260 SCCs and SMCs to to serial I/O - -include - console.h: function declarations for console related functions - -timer - Uses the MPC8260 timebase register for timing - tests. It only uses the lower 32 bits - -vectors - MPC8260 specific vector entry points. - Includes CPU dependant, application independant - handlers: alignment.