bsps: Move VME support to bsps

The VME support is only used by powerpc BSPs.

This patch is a part of the BSP source reorganization.

Update #3285.

22 files changed, 14 insertions, 35 deletions

diff --git a/bsps/headers.am b/bsps/headers.am
index ab7fa34c58..294d7869a9 100644
--- a/bsps/headers.am
+++ b/bsps/headers.am
@@ -23,11 +23,6 @@ include_bsp_HEADERS += ../../bsps/include/bsp/stackalloc.h
 include_bsp_HEADERS += ../../bsps/include/bsp/u-boot.h
 include_bsp_HEADERS += ../../bsps/include/bsp/uart-output-char.h
 include_bsp_HEADERS += ../../bsps/include/bsp/utility.h
-include_bsp_HEADERS += ../../bsps/include/bsp/vmeTsi148.h
-include_bsp_HEADERS += ../../bsps/include/bsp/vmeTsi148DMA.h
-include_bsp_HEADERS += ../../bsps/include/bsp/vmeUniverse.h
-include_bsp_HEADERS += ../../bsps/include/bsp/vmeUniverseDMA.h
-include_bsp_HEADERS += ../../bsps/include/bsp/vme_am_defs.h
 
 include_libchipdir = $(includedir)/libchip
 include_libchip_HEADERS =
diff --git a/bsps/powerpc/headers.am b/bsps/powerpc/headers.am
index 17122404e3..ac73dce08c 100644
--- a/bsps/powerpc/headers.am
+++ b/bsps/powerpc/headers.am
@@ -25,6 +25,11 @@ include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/tsec.h
 include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/u-boot-board-info.h
 include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/uart.h
 include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vectors.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vmeTsi148.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vmeTsi148DMA.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vmeUniverse.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vmeUniverseDMA.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vme_am_defs.h
 include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vpd.h
 
 include_libcpudir = $(includedir)/libcpu
diff --git a/bsps/include/bsp/vmeTsi148.h b/bsps/powerpc/include/bsp/vmeTsi148.h
index 6183940a2d..6183940a2d 100644
--- a/bsps/include/bsp/vmeTsi148.h
+++ b/bsps/powerpc/include/bsp/vmeTsi148.h
diff --git a/bsps/include/bsp/vmeTsi148DMA.h b/bsps/powerpc/include/bsp/vmeTsi148DMA.h
index da7c99302b..da7c99302b 100644
--- a/bsps/include/bsp/vmeTsi148DMA.h
+++ b/bsps/powerpc/include/bsp/vmeTsi148DMA.h
diff --git a/bsps/include/bsp/vmeUniverse.h b/bsps/powerpc/include/bsp/vmeUniverse.h
index 7cb9f8d2de..7cb9f8d2de 100644
--- a/bsps/include/bsp/vmeUniverse.h
+++ b/bsps/powerpc/include/bsp/vmeUniverse.h
diff --git a/bsps/include/bsp/vmeUniverseDMA.h b/bsps/powerpc/include/bsp/vmeUniverseDMA.h
index d0a3d6f0e7..d0a3d6f0e7 100644
--- a/bsps/include/bsp/vmeUniverseDMA.h
+++ b/bsps/powerpc/include/bsp/vmeUniverseDMA.h
diff --git a/bsps/include/bsp/vme_am_defs.h b/bsps/powerpc/include/bsp/vme_am_defs.h
index efa28b3aa0..efa28b3aa0 100644
--- a/bsps/include/bsp/vme_am_defs.h
+++ b/bsps/powerpc/include/bsp/vme_am_defs.h
diff --git a/bsps/powerpc/shared/vme-sources.am b/bsps/powerpc/shared/vme-sources.am
new file mode 100644
index 0000000000..62ce3fbcf6
--- /dev/null
+++ b/bsps/powerpc/shared/vme-sources.am
@@ -0,0 +1,5 @@
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/vme/bspVmeDmaList.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/vme/vmeconfig.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/vme/vmeTsi148.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/vme/vme_universe.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/vme/vmeUniverse.c
diff --git a/c/src/lib/libbsp/powerpc/shared/vme/README b/bsps/powerpc/shared/vme/README
index e2e0020026..e2e0020026 100644
--- a/c/src/lib/libbsp/powerpc/shared/vme/README
+++ b/bsps/powerpc/shared/vme/README
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/README.porting b/bsps/powerpc/shared/vme/README.porting
index 6873f5b1d6..6873f5b1d6 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/README.porting
+++ b/bsps/powerpc/shared/vme/README.porting
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/README.universe b/bsps/powerpc/shared/vme/README.universe
index 1059d8c806..1059d8c806 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/README.universe
+++ b/bsps/powerpc/shared/vme/README.universe
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.c b/bsps/powerpc/shared/vme/bspVmeDmaList.c
index 73b398dda1..73b398dda1 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.c
+++ b/bsps/powerpc/shared/vme/bspVmeDmaList.c
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaListP.h b/bsps/powerpc/shared/vme/bspVmeDmaListP.h
index 1a1f97b9ad..1a1f97b9ad 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaListP.h
+++ b/bsps/powerpc/shared/vme/bspVmeDmaListP.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/doxygen.h b/bsps/powerpc/shared/vme/doxygen.h
index 88ded941ac..88ded941ac 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/doxygen.h
+++ b/bsps/powerpc/shared/vme/doxygen.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c b/bsps/powerpc/shared/vme/vmeTsi148.c
index 4e1893b593..4e1893b593 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c
+++ b/bsps/powerpc/shared/vme/vmeTsi148.c
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c b/bsps/powerpc/shared/vme/vmeUniverse.c
index c7373b4e51..c7373b4e51 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
+++ b/bsps/powerpc/shared/vme/vmeUniverse.c
diff --git a/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c b/bsps/powerpc/shared/vme/vme_universe.c
index 158a899b2a..158a899b2a 100644
--- a/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c
+++ b/bsps/powerpc/shared/vme/vme_universe.c
diff --git a/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c b/bsps/powerpc/shared/vme/vmeconfig.c
index c128d75f3c..c128d75f3c 100644
--- a/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c
+++ b/bsps/powerpc/shared/vme/vmeconfig.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index b47dbf1d2b..608a036350 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -82,13 +82,6 @@ libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
     pci/gt_pci_init.c pci/pci_io_remap.c pci/motload_fixup.c \
     ../../powerpc/shared/pci/pcifinddevice.c
 
-#vme
-libbsp_a_SOURCES += ../shared/vme/vmeconfig.c \
-    ../shared/vme/vme_universe.c \
-    ../../shared/vmeUniverse/vmeUniverse.c \
-    ../../shared/vmeUniverse/vmeTsi148.c \
-    ../../shared/vmeUniverse/bspVmeDmaList.c
-
 #network
 if HAS_NETWORKING
 noinst_PROGRAMS += network_support.rel
@@ -176,4 +169,5 @@ include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/vme-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/beatnik/headers.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index f6b105d996..bc2e4266ac 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -95,15 +95,6 @@ libbsp_a_SOURCES += ../../powerpc/shared/residual/pnp.h
 libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.h
 libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c
 
-# vme
-libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c
-libbsp_a_SOURCES += ../../shared/vmeUniverse/bspVmeDmaList.c
-libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.h
-libbsp_a_SOURCES += ../../shared/vmeUniverse/vme_am_defs.h
-libbsp_a_SOURCES += ../../shared/vmeUniverse/VME.h
-libbsp_a_SOURCES += ../../powerpc/shared/vme/vmeconfig.c
-libbsp_a_SOURCES += ../../powerpc/shared/vme/vme_universe.c
-
 if QEMU
 if HAS_NETWORKING
 libbsp_a_SOURCES += ../../i386/pc386/ne2000/ne2000.c
@@ -128,4 +119,5 @@ include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/vme-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/motorola_powerpc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 37362d0cad..337211a084 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -73,15 +73,6 @@ libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
     ../../powerpc/shared/pci/generic_clear_hberrs.c \
     ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h
 
-# vme
-libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeTsi148.c \
-    ../../shared/vmeUniverse/bspVmeDmaList.c \
-    ../../shared/vmeUniverse/vmeTsi148.h \
-    ../../shared/vmeUniverse/vme_am_defs.h \
-    ../../shared/vmeUniverse/VME.h \
-    ../../powerpc/shared/vme/vmeconfig.c \
-    ../../powerpc/shared/vme/vme_universe.c
-
 # flash
 libbsp_a_SOURCES += ../shared/flash/flash.c \
     ../shared/flash/spansionFlash.c \
@@ -108,4 +99,5 @@ include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/vme-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/mvme3100/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 551c7f0a75..42bcd70394 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -52,11 +52,6 @@ libbsp_a_SOURCES += vectors/exceptionhandler.c \
 # GT64260
 libbsp_a_SOURCES += GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c
 
-# vme
-libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c\
-	../shared/vme/vmeconfig.c ../../shared/vmeUniverse/bspVmeDmaList.c\
-	../shared/vme/vme_universe.c
-
 if HAS_NETWORKING
 network_CPPFLAGS = -D_KERNEL -D__BSD_VISIBLE
 noinst_PROGRAMS += network.rel
@@ -95,4 +90,5 @@ include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am
+include $(srcdir)/../../../../../../bsps/powerpc/shared/vme-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/mvme5500/headers.am