summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-02-20 21:57:26 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-02-20 21:57:26 +0000
commite00763df0d06a84c6c42913748ad4e899672db82 (patch)
treed104c5bf64e3a4a53b615380686c46f00507d105 /c
parent2003-02-20 Till Straumann <strauman@slac.stanford.edu> (diff)
downloadrtems-e00763df0d06a84c6c42913748ad4e899672db82.tar.bz2
2003-02-20 Till Straumann <strauman@slac.stanford.edu>
PR 349/bsps * Makefile.am, configure.ac: Add glue to the powerpc/shared BSP to use the vmeUniverse VME-PCI bridge driver. * vme/.cvsignore, vme/Makefile.am, wrapup/Makefile.am: New files.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog7
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac1
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/vme/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am48
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am2
6 files changed, 60 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
index 96d8a83e58..09e5831bce 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
@@ -1,6 +1,13 @@
2003-02-20 Till Straumann <strauman@slac.stanford.edu>
PR 349/bsps
+ * Makefile.am, configure.ac: Add glue to the powerpc/shared BSP
+ to use the vmeUniverse VME-PCI bridge driver.
+ * vme/.cvsignore, vme/Makefile.am, wrapup/Makefile.am: New files.
+
+2003-02-20 Till Straumann <strauman@slac.stanford.edu>
+
+ PR 349/bsps
* openpic/Makefile.am, pci/Makefile.am:
- install the 'openpic.h' and 'pci.h' headers
- avoid a name clash by renaming 'vsprintf' & friends
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 5d2a972a55..6a597a893f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
SUBDIRS = include clock console pci residual openpic irq vectors start \
- startup bootloader motorola @exceptions@ wrapup
+ startup bootloader motorola @exceptions@ vme wrapup
include $(top_srcdir)/../../bsp.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
index 892f68c3be..674453ddd4 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
@@ -45,6 +45,7 @@ residual/Makefile
start/Makefile
startup/Makefile
vectors/Makefile
+vme/Makefile
wrapup/Makefile])
RTEMS_PPC_EXCEPTIONS([new])
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am
new file mode 100644
index 0000000000..8001f57584
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am
@@ -0,0 +1,48 @@
+##
+## $Id$
+##
+
+VPATH = @srcdir@:@srcdir@/../../shared/vme:@srcdir@/../../../shared/vmeUniverse:
+
+H_FILES = ../pci/pci.h ../irq/irq.h ../vme/VME.h ../vme/VMEConfig.h
+
+C_FILES = vmeUniverse.c vmeconfig.c
+
+
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+OBJS = $(C_O_FILES)
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = ../../shared/vme/VMEConfig.h
+include_bsp_HEADERS += ../../shared/vme/VME.h
+include_bsp_HEADERS += ../../../shared/vmeUniverse/vmeUniverse.h
+
+$(PROJECT_INCLUDE):
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/bsp:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: vmeUniverse.h
+ $(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE)/bsp/VME.h: VME.h
+ $(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE)/bsp/VMEConfig.h: VMEConfig.h
+ $(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
+ $(addprefix $(PROJECT_INCLUDE)/bsp/,$(notdir $(include_bsp_HEADERS)))
+
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS)
+
+include $(top_srcdir)/../../../../../../automake/compile.am
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
index 0f41afb9d1..09b27143f3 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
@@ -2,7 +2,7 @@
## $Id$
##
-BSP_PIECES = clock console irq openpic pci residual startup vectors motorola
+BSP_PIECES = clock console irq openpic pci residual startup vectors motorola vme
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \