bsps: Move MPCI support to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

27 files changed, 20 insertions, 20 deletions

diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/addrconv.c b/bsps/m68k/mvme147s/mpci/addrconv.c
index 0ed0fdbed1..0ed0fdbed1 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/addrconv.c
+++ b/bsps/m68k/mvme147s/mpci/addrconv.c
diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/getcfg.c b/bsps/m68k/mvme147s/mpci/getcfg.c
index c549a9fcea..c549a9fcea 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/getcfg.c
+++ b/bsps/m68k/mvme147s/mpci/getcfg.c
diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/lock.c b/bsps/m68k/mvme147s/mpci/lock.c
index 129de01fd0..129de01fd0 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/lock.c
+++ b/bsps/m68k/mvme147s/mpci/lock.c
diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/mpisr.c b/bsps/m68k/mvme147s/mpci/mpisr.c
index 0669538e1b..0669538e1b 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/mpisr.c
+++ b/bsps/m68k/mvme147s/mpci/mpisr.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/addrconv.c b/bsps/no_cpu/no_bsp/mpci/addrconv.c
index 2656bc1ccf..2656bc1ccf 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/addrconv.c
+++ b/bsps/no_cpu/no_bsp/mpci/addrconv.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c b/bsps/no_cpu/no_bsp/mpci/getcfg.c
index 2179838b4b..2179838b4b 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c
+++ b/bsps/no_cpu/no_bsp/mpci/getcfg.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c b/bsps/no_cpu/no_bsp/mpci/lock.c
index 5b53df8d38..5b53df8d38 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
+++ b/bsps/no_cpu/no_bsp/mpci/lock.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/mpisr.c b/bsps/no_cpu/no_bsp/mpci/mpisr.c
index 19939ec81c..19939ec81c 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/mpisr.c
+++ b/bsps/no_cpu/no_bsp/mpci/mpisr.c
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/README b/bsps/powerpc/psim/mpci/README
index ba2d67752f..ba2d67752f 100644
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/README
+++ b/bsps/powerpc/psim/mpci/README
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/addrconv.c b/bsps/powerpc/psim/mpci/addrconv.c
index 2656bc1ccf..2656bc1ccf 100644
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/addrconv.c
+++ b/bsps/powerpc/psim/mpci/addrconv.c
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/getcfg.c b/bsps/powerpc/psim/mpci/getcfg.c
index 6be42f8b9c..6be42f8b9c 100644
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/getcfg.c
+++ b/bsps/powerpc/psim/mpci/getcfg.c
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/lock.c b/bsps/powerpc/psim/mpci/lock.c
index 6c0907e30f..6c0907e30f 100644
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/lock.c
+++ b/bsps/powerpc/psim/mpci/lock.c
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/mpisr.c b/bsps/powerpc/psim/mpci/mpisr.c
index 8987a5a272..8987a5a272 100644
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/mpisr.c
+++ b/bsps/powerpc/psim/mpci/mpisr.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/shmsupp/intercom-mpci.c b/bsps/powerpc/qoriq/mpci/intercom-mpci.c
index 2cc45dd079..2cc45dd079 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/shmsupp/intercom-mpci.c
+++ b/bsps/powerpc/qoriq/mpci/intercom-mpci.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/shmsupp/intercom.c b/bsps/powerpc/qoriq/mpci/intercom.c
index e7e0d5650f..e7e0d5650f 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/shmsupp/intercom.c
+++ b/bsps/powerpc/qoriq/mpci/intercom.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/shmsupp/lock.S b/bsps/powerpc/qoriq/mpci/lock.S
index c6e72a7533..c6e72a7533 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/shmsupp/lock.S
+++ b/bsps/powerpc/qoriq/mpci/lock.S
diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/README b/bsps/sparc/leon3/mpci/README
index 9ad11538b7..9ad11538b7 100644
--- a/c/src/lib/libbsp/sparc/leon3/shmsupp/README
+++ b/bsps/sparc/leon3/mpci/README
diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/addrconv.c b/bsps/sparc/leon3/mpci/addrconv.c
index 2656bc1ccf..2656bc1ccf 100644
--- a/c/src/lib/libbsp/sparc/leon3/shmsupp/addrconv.c
+++ b/bsps/sparc/leon3/mpci/addrconv.c
diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/getcfg.c b/bsps/sparc/leon3/mpci/getcfg.c
index fc67cf8e3a..fc67cf8e3a 100644
--- a/c/src/lib/libbsp/sparc/leon3/shmsupp/getcfg.c
+++ b/bsps/sparc/leon3/mpci/getcfg.c
diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c b/bsps/sparc/leon3/mpci/lock.c
index 5b118f24b6..5b118f24b6 100644
--- a/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c
+++ b/bsps/sparc/leon3/mpci/lock.c
diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/mpisr.c b/bsps/sparc/leon3/mpci/mpisr.c
index cdf05293f1..cdf05293f1 100644
--- a/c/src/lib/libbsp/sparc/leon3/shmsupp/mpisr.c
+++ b/bsps/sparc/leon3/mpci/mpisr.c
diff --git a/c/src/aclocal/check-multiprocessing.m4 b/c/src/aclocal/check-multiprocessing.m4
index 5959f345d1..ee2ea3a75c 100644
--- a/c/src/aclocal/check-multiprocessing.m4
+++ b/c/src/aclocal/check-multiprocessing.m4
@@ -22,7 +22,7 @@ AS_IF([test "$rtems_cv_want_multiprocessing" = "yes"],
 [
   AC_CACHE_CHECK([whether BSP supports multiprocessing],
   [rtems_cv_HAS_MP],[
-    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/shmsupp"; then
+    if test -d "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/mpci"; then
         rtems_cv_HAS_MP="yes" ;
     else
         rtems_cv_HAS_MP="no";
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index 72ba5c5213..b709b9f6d6 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -39,10 +39,10 @@ librtemsbsp_a_SOURCES += ../mvme147/timer/timerisr.S
 
 if HAS_MP
 # shmsupp
-librtemsbsp_a_SOURCES += shmsupp/addrconv.c
-librtemsbsp_a_SOURCES += shmsupp/getcfg.c
-librtemsbsp_a_SOURCES += shmsupp/lock.c
-librtemsbsp_a_SOURCES += shmsupp/mpisr.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147s/mpci/addrconv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147s/mpci/getcfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147s/mpci/lock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147s/mpci/mpisr.c
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
index e0d7676fe6..e4c11f6f5a 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
@@ -28,10 +28,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/btimer/btimer.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/btimer/timerisr.c
 # shmsupp
-librtemsbsp_a_SOURCES += shmsupp/addrconv.c
-librtemsbsp_a_SOURCES += shmsupp/getcfg.c
-librtemsbsp_a_SOURCES += shmsupp/lock.c
-librtemsbsp_a_SOURCES += shmsupp/mpisr.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/mpci/addrconv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/mpci/getcfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/mpci/lock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/mpci/mpisr.c
 
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index ba26ca315d..c9560601cb 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -48,10 +48,10 @@ librtemsbsp_a_SOURCES += vectors/align_h.S
 
 if HAS_MP
 # shmdr
-librtemsbsp_a_SOURCES += shmsupp/addrconv.c
-librtemsbsp_a_SOURCES += shmsupp/getcfg.c
-librtemsbsp_a_SOURCES += shmsupp/lock.c
-librtemsbsp_a_SOURCES += shmsupp/mpisr.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/mpci/addrconv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/mpci/getcfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/mpci/lock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/mpci/mpisr.c
 endif
 
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index d64191285f..6f6972ca2b 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -76,9 +76,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
 librtemsbsp_a_SOURCES += rtc/rtc-config.c
 
 # MPCI
-librtemsbsp_a_SOURCES += shmsupp/lock.S
-librtemsbsp_a_SOURCES += shmsupp/intercom.c
-librtemsbsp_a_SOURCES += shmsupp/intercom-mpci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/mpci/lock.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/mpci/intercom.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/mpci/intercom-mpci.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index cd5d1dfa46..c64bec2458 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -186,10 +186,10 @@ endif
 
 if HAS_MP
 # shmsupp
-librtemsbsp_a_SOURCES += shmsupp/addrconv.c
-librtemsbsp_a_SOURCES += shmsupp/getcfg.c
-librtemsbsp_a_SOURCES += shmsupp/lock.c
-librtemsbsp_a_SOURCES += shmsupp/mpisr.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/mpci/addrconv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/mpci/getcfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/mpci/lock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/mpci/mpisr.c
 endif