[rtems commit] bsps: Move VME support to bsps

Sebastian Huber sebh at rtems.org
Mon Apr 9 05:12:24 UTC 2018 

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Apr  3 16:41:16 2018 +0200

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.

---

 bsps/headers.am                                                |  5 -----
 bsps/powerpc/headers.am                                        |  5 +++++
 bsps/{ => powerpc}/include/bsp/vmeTsi148.h                     |  0
 bsps/{ => powerpc}/include/bsp/vmeTsi148DMA.h                  |  0
 bsps/{ => powerpc}/include/bsp/vmeUniverse.h                   |  0
 bsps/{ => powerpc}/include/bsp/vmeUniverseDMA.h                |  0
 bsps/{ => powerpc}/include/bsp/vme_am_defs.h                   |  0
 bsps/powerpc/shared/vme-sources.am                             |  5 +++++
 {c/src/lib/libbsp => bsps}/powerpc/shared/vme/README           |  0
 .../vmeUniverse => bsps/powerpc/shared/vme}/README.porting     |  0
 .../vmeUniverse => bsps/powerpc/shared/vme}/README.universe    |  0
 .../vmeUniverse => bsps/powerpc/shared/vme}/bspVmeDmaList.c    |  0
 .../vmeUniverse => bsps/powerpc/shared/vme}/bspVmeDmaListP.h   |  0
 .../shared/vmeUniverse => bsps/powerpc/shared/vme}/doxygen.h   |  0
 .../shared/vmeUniverse => bsps/powerpc/shared/vme}/vmeTsi148.c |  0
 .../vmeUniverse => bsps/powerpc/shared/vme}/vmeUniverse.c      |  0
 {c/src/lib/libbsp => bsps}/powerpc/shared/vme/vme_universe.c   |  0
 {c/src/lib/libbsp => bsps}/powerpc/shared/vme/vmeconfig.c      |  0
 c/src/lib/libbsp/powerpc/beatnik/Makefile.am                   |  8 +-------
 c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am          | 10 +---------
 c/src/lib/libbsp/powerpc/mvme3100/Makefile.am                  | 10 +---------
 c/src/lib/libbsp/powerpc/mvme5500/Makefile.am                  |  6 +-----
 22 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/bsps/headers.am b/bsps/headers.am
index ab7fa34..294d786 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 1712240..ac73dce 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
similarity index 100%
rename from bsps/include/bsp/vmeTsi148.h
rename to bsps/powerpc/include/bsp/vmeTsi148.h
diff --git a/bsps/include/bsp/vmeTsi148DMA.h b/bsps/powerpc/include/bsp/vmeTsi148DMA.h
similarity index 100%
rename from bsps/include/bsp/vmeTsi148DMA.h
rename to bsps/powerpc/include/bsp/vmeTsi148DMA.h
diff --git a/bsps/include/bsp/vmeUniverse.h b/bsps/powerpc/include/bsp/vmeUniverse.h
similarity index 100%
rename from bsps/include/bsp/vmeUniverse.h
rename to bsps/powerpc/include/bsp/vmeUniverse.h
diff --git a/bsps/include/bsp/vmeUniverseDMA.h b/bsps/powerpc/include/bsp/vmeUniverseDMA.h
similarity index 100%
rename from bsps/include/bsp/vmeUniverseDMA.h
rename to 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
similarity index 100%
rename from bsps/include/bsp/vme_am_defs.h
rename to 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 0000000..62ce3fb
--- /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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/vme/README
rename to bsps/powerpc/shared/vme/README
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/README.porting b/bsps/powerpc/shared/vme/README.porting
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/README.porting
rename to bsps/powerpc/shared/vme/README.porting
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/README.universe b/bsps/powerpc/shared/vme/README.universe
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/README.universe
rename to bsps/powerpc/shared/vme/README.universe
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.c b/bsps/powerpc/shared/vme/bspVmeDmaList.c
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.c
rename to bsps/powerpc/shared/vme/bspVmeDmaList.c
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaListP.h b/bsps/powerpc/shared/vme/bspVmeDmaListP.h
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaListP.h
rename to bsps/powerpc/shared/vme/bspVmeDmaListP.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/doxygen.h b/bsps/powerpc/shared/vme/doxygen.h
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/doxygen.h
rename to bsps/powerpc/shared/vme/doxygen.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c b/bsps/powerpc/shared/vme/vmeTsi148.c
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c
rename to bsps/powerpc/shared/vme/vmeTsi148.c
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c b/bsps/powerpc/shared/vme/vmeUniverse.c
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c
rename to 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 b47dbf1..608a036 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 f6b105d..bc2e426 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 37362d0..337211a 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 551c7f0..42bcd70 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

More information about the vc mailing list