[rtems commit] bsps: Move MPCI support to bsps

Sebastian Huber sebh at rtems.org
Fri Apr 20 13:30:24 UTC 2018


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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Apr 20 13:38:33 2018 +0200

bsps: Move MPCI support to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

---

 .../m68k/mvme147s/shmsupp => bsps/m68k/mvme147s/mpci}/addrconv.c  | 0
 .../m68k/mvme147s/shmsupp => bsps/m68k/mvme147s/mpci}/getcfg.c    | 0
 .../m68k/mvme147s/shmsupp => bsps/m68k/mvme147s/mpci}/lock.c      | 0
 .../m68k/mvme147s/shmsupp => bsps/m68k/mvme147s/mpci}/mpisr.c     | 0
 .../sparc/leon3/shmsupp => bsps/no_cpu/no_bsp/mpci}/addrconv.c    | 0
 .../no_cpu/no_bsp/shmsupp => bsps/no_cpu/no_bsp/mpci}/getcfg.c    | 0
 .../no_cpu/no_bsp/shmsupp => bsps/no_cpu/no_bsp/mpci}/lock.c      | 0
 .../no_cpu/no_bsp/shmsupp => bsps/no_cpu/no_bsp/mpci}/mpisr.c     | 0
 .../libbsp/powerpc/psim/shmsupp => bsps/powerpc/psim/mpci}/README | 0
 .../powerpc/psim/shmsupp => bsps/powerpc/psim/mpci}/addrconv.c    | 0
 .../powerpc/psim/shmsupp => bsps/powerpc/psim/mpci}/getcfg.c      | 0
 .../libbsp/powerpc/psim/shmsupp => bsps/powerpc/psim/mpci}/lock.c | 0
 .../powerpc/psim/shmsupp => bsps/powerpc/psim/mpci}/mpisr.c       | 0
 .../qoriq/shmsupp => bsps/powerpc/qoriq/mpci}/intercom-mpci.c     | 0
 .../powerpc/qoriq/shmsupp => bsps/powerpc/qoriq/mpci}/intercom.c  | 0
 .../powerpc/qoriq/shmsupp => bsps/powerpc/qoriq/mpci}/lock.S      | 0
 .../libbsp/sparc/leon3/shmsupp => bsps/sparc/leon3/mpci}/README   | 0
 .../no_cpu/no_bsp/shmsupp => bsps/sparc/leon3/mpci}/addrconv.c    | 0
 .../libbsp/sparc/leon3/shmsupp => bsps/sparc/leon3/mpci}/getcfg.c | 0
 .../libbsp/sparc/leon3/shmsupp => bsps/sparc/leon3/mpci}/lock.c   | 0
 .../libbsp/sparc/leon3/shmsupp => bsps/sparc/leon3/mpci}/mpisr.c  | 0
 c/src/aclocal/check-multiprocessing.m4                            | 2 +-
 c/src/lib/libbsp/m68k/mvme147s/Makefile.am                        | 8 ++++----
 c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am                        | 8 ++++----
 c/src/lib/libbsp/powerpc/psim/Makefile.am                         | 8 ++++----
 c/src/lib/libbsp/powerpc/qoriq/Makefile.am                        | 6 +++---
 c/src/lib/libbsp/sparc/leon3/Makefile.am                          | 8 ++++----
 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147s/shmsupp/addrconv.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147s/shmsupp/getcfg.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147s/shmsupp/lock.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147s/shmsupp/mpisr.c
rename to bsps/m68k/mvme147s/mpci/mpisr.c
diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/addrconv.c b/bsps/no_cpu/no_bsp/mpci/addrconv.c
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/shmsupp/addrconv.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/mpisr.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/shmsupp/README
rename to bsps/powerpc/psim/mpci/README
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/addrconv.c b/bsps/powerpc/psim/mpci/addrconv.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/shmsupp/addrconv.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/shmsupp/getcfg.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/shmsupp/lock.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/shmsupp/mpisr.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/shmsupp/intercom-mpci.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/shmsupp/intercom.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/shmsupp/lock.S
rename to bsps/powerpc/qoriq/mpci/lock.S
diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/README b/bsps/sparc/leon3/mpci/README
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/shmsupp/README
rename to bsps/sparc/leon3/mpci/README
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/addrconv.c b/bsps/sparc/leon3/mpci/addrconv.c
similarity index 100%
rename from c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/addrconv.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/shmsupp/getcfg.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/shmsupp/mpisr.c
rename to bsps/sparc/leon3/mpci/mpisr.c
diff --git a/c/src/aclocal/check-multiprocessing.m4 b/c/src/aclocal/check-multiprocessing.m4
index 5959f34..ee2ea3a 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 72ba5c5..b709b9f 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 e0d7676..e4c11f6 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 ba26ca3..c956060 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 d641912..6f6972c 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 cd5d1df..c64bec2 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
 
 




More information about the vc mailing list