summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-01-30 15:11:52 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-01-30 15:11:52 +0000
commit3f5232acb61216ca52131b6a98ac5f6460abf7b4 (patch)
tree4fe2fc6034df5244260b7c28e4a3731b8362c439 /c/src/lib/libbsp/powerpc
parent2004-01-30 Wilfried Busalski <w.busalski@lancier-monitoring.de> (diff)
downloadrtems-3f5232acb61216ca52131b6a98ac5f6460abf7b4.tar.bz2
2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, irq/Makefile.am, motorola/Makefile.am, openpic/Makefile.am, pci/Makefile.am, residual/Makefile.am, start/Makefile.am, startup/Makefile.am, vectors/Makefile.am, vme/Makefile.am. Use automake compilation rules. Rename clock.rel to pclock.rel (Conflict with libcpu). * clock/Makefile.am, console/Makefile.am, irq/Makefile.am, motorola/Makefile.am, openpic/Makefile.am, pci/Makefile.am, residual/Makefile.am, start/Makefile.am, startup/Makefile.am, vectors/Makefile.am, vme/Makefile.am: Remove. * configure.ac: Reflect changes above. * wrapup/Makefile.am: Reflect changes above.
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog15
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am263
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/clock/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am18
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac11
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/console/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am31
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/irq/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am48
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am39
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am39
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/pci/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am37
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/residual/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am22
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/start/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am41
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/startup/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am55
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am47
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/vme/.cvsignore2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am56
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am12
26 files changed, 270 insertions, 486 deletions
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
index 344e73261c..029617fe88 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
@@ -1,5 +1,20 @@
2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
+ irq/Makefile.am, motorola/Makefile.am, openpic/Makefile.am,
+ pci/Makefile.am, residual/Makefile.am, start/Makefile.am,
+ startup/Makefile.am, vectors/Makefile.am, vme/Makefile.am.
+ Use automake compilation rules.
+ Rename clock.rel to pclock.rel (Conflict with libcpu).
+ * clock/Makefile.am, console/Makefile.am, irq/Makefile.am,
+ motorola/Makefile.am, openpic/Makefile.am, pci/Makefile.am,
+ residual/Makefile.am, start/Makefile.am, startup/Makefile.am,
+ vectors/Makefile.am, vme/Makefile.am: Remove.
+ * configure.ac: Reflect changes above.
+ * wrapup/Makefile.am: Reflect changes above.
+
+2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* wrapup/Makefile.am: Reflect changes to
../support/*exception_processing/*.
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index fbb657c8c4..3c03dc10fc 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -6,33 +6,229 @@ 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 = . clock console pci residual openpic irq vectors start startup \
- bootloader motorola @exceptions@ vme wrapup
+SUBDIRS = . bootloader @exceptions@ wrapup
+include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
+EXTRA_PROGRAMS =
+CLEANFILES =
+noinst_DATA =
+
include_bspdir = $(includedir)/bsp
-nodist_include_HEADERS += ../shared/include/nvram.h
+nodist_include_HEADERS += ../../powerpc/shared/include/nvram.h
nodist_include_HEADERS += ../../shared/include/coverhd.h
-nodist_include_bsp_HEADERS = ../shared/console/consoleIo.h
-nodist_include_bsp_HEADERS += ../shared/console/uart.h
-nodist_include_bsp_HEADERS += ../shared/irq/irq.h
-nodist_include_bsp_HEADERS += ../shared/motorola/motorola.h
+nodist_include_bsp_HEADERS = ../../powerpc/shared/console/consoleIo.h
+nodist_include_bsp_HEADERS += ../../powerpc/shared/console/uart.h
+
+EXTRA_DIST = ../../powerpc/shared/start/start.S
+start$(LIB_VARIANT).$(OBJEXT): ../../powerpc/shared/start/start.S
+ ${CCASCOMPILE} -DASM -o $@ -c $<
+project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
+
+EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S
+rtems_crti$(LIB_VARIANT).$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+ ${CCASCOMPILE} -DASM -o $@ -c $<
+project_lib_DATA += rtems_crti$(LIB_VARIANT).$(OBJEXT)
+
+dist_project_lib_DATA += startup/linkcmds
+
+EXTRA_PROGRAMS += startup.rel
+CLEANFILES += startup.rel
+startup_rel_SOURCES = ../../powerpc/shared/startup/bspstart.c \
+ ../../powerpc/shared/startup/pgtbl_setup.c \
+ ../../powerpc/shared/startup/pgtbl_activate.c \
+ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
+ ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \
+ ../../shared/main.c ../../shared/gnatinstallhandler.c
+startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += startup_g.rel
+CLEANFILES += startup_g.rel
+startup_g_rel_SOURCES = $(startup_rel_SOURCES)
+startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += startup$(LIB_VARIANT).rel
+
+EXTRA_PROGRAMS += pclock.rel
+CLEANFILES += pclock.rel
+pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c
+pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += pclock_g.rel
+CLEANFILES += pclock_g.rel
+pclock_g_rel_SOURCES = $(pclock_rel_SOURCES)
+pclock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+pclock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += pclock$(LIB_VARIANT).rel
+
+console_CPPFLAGS = -DSTATIC_LOG_ALLOC
+EXTRA_PROGRAMS += console.rel
+CLEANFILES += console.rel
+console_rel_SOURCES = ../../powerpc/shared/console/polled_io.c \
+ ../../powerpc/shared/console/uart.c \
+ ../../powerpc/shared/console/console.c \
+ ../../powerpc/shared/console/inch.c \
+ ../../powerpc/shared/console/reboot.c \
+ ../../powerpc/shared/console/consoleIo.h \
+ ../../powerpc/shared/console/keyboard.h \
+ ../../powerpc/shared/console/uart.h
+console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
+ $(console_CPPFLAGS)
+console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += console_g.rel
+CLEANFILES += console_g.rel
+console_g_rel_SOURCES = $(console_rel_SOURCES)
+console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
+ $(console_CPPFLAGS)
+console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += console$(LIB_VARIANT).rel
+
+nodist_include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h
+
+EXTRA_PROGRAMS += irq.rel
+CLEANFILES += irq.rel
+irq_rel_SOURCES = ../../powerpc/shared/irq/irq_init.c \
+ ../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.c \
+ ../../powerpc/shared/irq/irq_asm.S ../../powerpc/shared/irq/irq.h
+irq_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += irq_g.rel
+CLEANFILES += irq_g.rel
+irq_g_rel_SOURCES = $(irq_rel_SOURCES)
+irq_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+irq_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += irq$(LIB_VARIANT).rel
+
+nodist_include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h
+
+EXTRA_PROGRAMS += motorola.rel
+CLEANFILES += motorola.rel
+motorola_rel_SOURCES = ../../powerpc/shared/motorola/motorola.h \
+ ../../powerpc/shared/motorola/motorola.c
+motorola_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+motorola_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += motorola_g.rel
+CLEANFILES += motorola_g.rel
+motorola_g_rel_SOURCES = $(motorola_rel_SOURCES)
+motorola_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+motorola_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += motorola$(LIB_VARIANT).rel
+
+nodist_include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
+
+EXTRA_PROGRAMS += openpic.rel
+CLEANFILES += openpic.rel
+openpic_rel_SOURCES = ../../powerpc/shared/openpic/openpic.h \
+ ../../powerpc/shared/openpic/openpic.c
+openpic_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+openpic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += openpic_g.rel
+CLEANFILES += openpic_g.rel
+openpic_g_rel_SOURCES = $(openpic_rel_SOURCES)
+openpic_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+openpic_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += openpic$(LIB_VARIANT).rel
-all-local: $(PREINSTALL_FILES)
+nodist_include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
-EXTRA_DIST = BOOTING README.MVME2300 README.OTHERBOARDS README.dec21140
+EXTRA_PROGRAMS += pci.rel
+CLEANFILES += pci.rel
+pci_rel_SOURCES = ../../powerpc/shared/pci/pci.c \
+ ../../powerpc/shared/pci/detect_raven_bridge.c \
+ ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h
+pci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += pci_g.rel
+CLEANFILES += pci_g.rel
+pci_g_rel_SOURCES = $(pci_rel_SOURCES)
+pci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+pci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += pci$(LIB_VARIANT).rel
+
+EXTRA_PROGRAMS += residual.rel
+CLEANFILES += residual.rel
+residual_rel_SOURCES = ../../powerpc/shared/residual/pnp.h \
+ ../../powerpc/shared/residual/residual.h \
+ ../../powerpc/shared/residual/residual.c
+residual_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+residual_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += residual_g.rel
+CLEANFILES += residual_g.rel
+residual_g_rel_SOURCES = $(residual_rel_SOURCES)
+residual_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+residual_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += residual$(LIB_VARIANT).rel
+
+nodist_include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h
+
+EXTRA_PROGRAMS += vectors.rel
+CLEANFILES += vectors.rel
+vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors.h \
+ ../../powerpc/shared/vectors/vectors_init.c \
+ ../../powerpc/shared/vectors/vectors.S
+vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += vectors_g.rel
+CLEANFILES += vectors_g.rel
+vectors_g_rel_SOURCES = $(vectors_rel_SOURCES)
+vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += vectors$(LIB_VARIANT).rel
+
+nodist_include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
+ ../../powerpc/shared/vme/VMEConfig.h ../../powerpc/shared/vme/VME.h
+
+EXTRA_PROGRAMS += vme.rel
+CLEANFILES += vme.rel
+vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \
+ ../../shared/vmeUniverse/vmeUniverse.h \
+ ../../powerpc/shared/vme/vmeconfig.c \
+ ../../powerpc/shared/vme/VMEConfig.h ../../powerpc/shared/vme/VME.h
+vme_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += vme_g.rel
+CLEANFILES += vme_g.rel
+vme_g_rel_SOURCES = $(vme_rel_SOURCES)
+vme_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+vme_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += vme$(LIB_VARIANT).rel
+
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+EXTRA_DIST += BOOTING README.MVME2300 README.OTHERBOARDS README.dec21140
EXTRA_DIST += times.mcp750 times.mvme2307
PREINSTALL_DIRS =
+TMPINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-$(PROJECT_INCLUDE)/nvram.h: ../shared/include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/nvram.h: ../../powerpc/shared/include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nvram.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.h
@@ -40,24 +236,61 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
-$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../../powerpc/shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
-$(PROJECT_INCLUDE)/bsp/uart.h: ../shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-$(PROJECT_INCLUDE)/bsp/irq.h: ../shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+
+$(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT): rtems_crti$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT)
+
+$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
+TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
+
+$(PROJECT_INCLUDE)/bsp/irq.h: ../../powerpc/shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-$(PROJECT_INCLUDE)/bsp/motorola.h: ../shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+$(PROJECT_INCLUDE)/bsp/motorola.h: ../../powerpc/shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h
-CLEANFILES = $(PREINSTALL_FILES)
+$(PROJECT_INCLUDE)/bsp/openpic.h: ../../powerpc/shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h
+
+$(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
+
+$(PROJECT_INCLUDE)/bsp/vectors.h: ../../powerpc/shared/vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
+
+$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
+
+$(PROJECT_INCLUDE)/bsp/VMEConfig.h: ../../powerpc/shared/vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
+
+$(PROJECT_INCLUDE)/bsp/VME.h: ../../powerpc/shared/vme/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
+
+CLEANFILES += $(PREINSTALL_FILES)
DISTCLEANFILES = $(PREINSTALL_DIRS)
+CLEANFILES += $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am
deleted file mode 100644
index ed4ffefdcb..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-powerpc_shared_clock_C_FILES = \
- $(top_srcdir)/../../powerpc/shared/clock/p_clock.c
-OBJS = \
- $(powerpc_shared_clock_C_FILES:$(top_srcdir)/../../powerpc/shared/clock/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/clock/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-noinst_DATA = $(OBJS)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
index a419d2408e..fb7be807e4 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
@@ -38,17 +38,6 @@ AC_DEFINE_UNQUOTED([USE_ENHANCED_INTR_API],[1],
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
bootloader/Makefile
-clock/Makefile
-console/Makefile
-irq/Makefile
-motorola/Makefile
-openpic/Makefile
-pci/Makefile
-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/console/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am
deleted file mode 100644
index 9a819d8600..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-powerpc_shared_console_C_FILES = \
- $(top_srcdir)/../../powerpc/shared/console/polled_io.c \
- $(top_srcdir)/../../powerpc/shared/console/uart.c \
- $(top_srcdir)/../../powerpc/shared/console/console.c \
- $(top_srcdir)/../../powerpc/shared/console/inch.c \
- $(top_srcdir)/../../powerpc/shared/console/reboot.c
-OBJS = \
- $(powerpc_shared_console_C_FILES:$(top_srcdir)/../../powerpc/shared/console/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/console/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-# FIXME: This is nonsense.
-noinst_HEADERS = $(top_srcdir)/../../powerpc/shared/console/consoleIo.h \
- $(top_srcdir)/../../powerpc/shared/console/keyboard.h \
- $(top_srcdir)/../../powerpc/shared/console/uart.h
-
-noinst_DATA = $(OBJS)
-
-AM_CPPFLAGS += -DSTATIC_LOG_ALLOC
-
-all-local: $(OBJS)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am
deleted file mode 100644
index 52e3f8799e..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-include_bspdir = $(includedir)/bsp
-nodist_include_bsp_HEADERS = $(top_srcdir)/../../powerpc/shared/irq/irq.h
-
-powerpc_shared_irq_C_FILES = \
- $(top_srcdir)/../../powerpc/shared/irq/irq_init.c \
- $(top_srcdir)/../../powerpc/shared/irq/i8259.c \
- $(top_srcdir)/../../powerpc/shared/irq/irq.c
-OBJS = \
- $(powerpc_shared_irq_C_FILES:$(top_srcdir)/../../powerpc/shared/irq/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/irq/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-powerpc_shared_irq_S_FILES = \
- $(top_srcdir)/../../powerpc/shared/irq/irq_asm.S
-OBJS += \
- $(powerpc_shared_irq_S_FILES:$(top_srcdir)/../../powerpc/shared/irq/%.S=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/irq/%.S $(ARCH)/$(dirstamp)
- ${CCASCOMPILE} -o $@ -c $<
-
-noinst_DATA = $(OBJS)
-
-all-local: $(PREINSTALL_FILES)
-
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(mkdir_p) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/irq.h: $(top_srcdir)/../../powerpc/shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am
deleted file mode 100644
index f2589cdd44..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-include_bspdir = $(includedir)/bsp
-nodist_include_bsp_HEADERS = \
- $(top_srcdir)/../../powerpc/shared/motorola/motorola.h
-
-powerpc_shared_motorola_C_FILES = \
- $(top_srcdir)/../../powerpc/shared/motorola/motorola.c
-OBJS = \
- $(powerpc_shared_motorola_C_FILES:$(top_srcdir)/../../powerpc/shared/motorola/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/motorola/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-noinst_DATA = $(OBJS)
-
-all-local: $(PREINSTALL_FILES)
-
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(mkdir_p) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/motorola.h: $(top_srcdir)/../../powerpc/shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h
-
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am
deleted file mode 100644
index 0ba4fe2a66..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-include_bspdir = $(includedir)/bsp
-nodist_include_bsp_HEADERS = \
- $(top_srcdir)/../../powerpc/shared/openpic/openpic.h
-
-powerpc_shared_openpic_C_FILES = \
- $(top_srcdir)/../../powerpc/shared/openpic/openpic.c
-OBJS = \
- $(powerpc_shared_openpic_C_FILES:$(top_srcdir)/../../powerpc/shared/openpic/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/openpic/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-noinst_DATA = $(OBJS)
-
-all-local: $(PREINSTALL_FILES)
-
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(mkdir_p) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/openpic.h: $(top_srcdir)/../../powerpc/shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h
-
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am
deleted file mode 100644
index 48e45f1161..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-include_bspdir = $(includedir)/bsp
-nodist_include_bsp_HEADERS = $(top_srcdir)/../../powerpc/shared/pci/pci.h
-
-power_shared_pci_C_FILES = $(top_srcdir)/../../powerpc/shared/pci/pci.c \
- $(top_srcdir)/../../powerpc/shared/pci/detect_raven_bridge.c \
- $(top_srcdir)/../../powerpc/shared/pci/pcifinddevice.c
-OBJS = \
- $(power_shared_pci_C_FILES:$(top_srcdir)/../../powerpc/shared/pci/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/pci/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-noinst_DATA = $(OBJS)
-
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(mkdir_p) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/pci.h: $(top_srcdir)/../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am
deleted file mode 100644
index 1f9b54e384..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-# FIXME: This does not make much sense
-noinst_HEADERS = $(top_srcdir)/../../powerpc/shared/residual/pnp.h \
- $(top_srcdir)/../../powerpc/shared/residual/residual.h
-
-powerpc_shared_residual_C_FILES = \
- $(top_srcdir)/../../powerpc/shared/residual/residual.c
-OBJS = \
- $(powerpc_shared_residual_C_FILES:$(top_srcdir)/../../powerpc/shared/residual/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/residual/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-noinst_DATA = $(OBJS)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am
deleted file mode 100644
index 7d9edf3309..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-include $(top_srcdir)/../../bspstart.am
-
-powerpc_shared_start_S_FILES = \
- $(top_srcdir)/../../powerpc/shared/start/start.S \
- $(top_srcdir)/../../powerpc/shared/start/rtems_crti.S
-
-OBJS = \
- $(powerpc_shared_start_S_FILES:$(top_srcdir)/../../powerpc/shared/start/%.S=$(ARCH)/%$(LIB_VARIANT).$(OBJEXT))
-
-$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): $(top_srcdir)/../../powerpc/shared/start/%.S $(ARCH)/$(dirstamp)
- ${CCASCOMPILE} -o $@ -c $<
-
-project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
-project_lib_DATA += $(ARCH)/rtems_crti$(LIB_VARIANT).$(OBJEXT)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(mkdir_p) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT): $(ARCH)/rtems_crti$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am
deleted file mode 100644
index 3f81163026..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/startup.rel
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-powerpc_shared_startup_C_FILES = \
- $(top_srcdir)/../../powerpc/shared/startup/bspstart.c \
- $(top_srcdir)/../../powerpc/shared/startup/pgtbl_setup.c \
- $(top_srcdir)/../../powerpc/shared/startup/pgtbl_activate.c \
- $(top_srcdir)/../../powerpc/shared/startup/sbrk.c
-OBJS = \
- $(powerpc_shared_startup_C_FILES:$(top_srcdir)/../../powerpc/shared/startup/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/startup/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-shared_C_FILES = $(top_srcdir)/../../shared/bootcard.c
-shared_C_FILES += $(top_srcdir)/../../shared/bspclean.c
-shared_C_FILES += $(top_srcdir)/../../shared/bsplibc.c
-shared_C_FILES += $(top_srcdir)/../../shared/bsppost.c
-shared_C_FILES += $(top_srcdir)/../../shared/main.c
-shared_C_FILES += $(top_srcdir)/../../shared/gnatinstallhandler.c
-OBJS += \
- $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-$(PGM): $(OBJS)
- $(make-rel)
-
-project_lib_DATA = linkcmds
-
-all-local: $(PGM) $(TMPINSTALL_FILES)
-
-EXTRA_DIST = linkcmds
-
-TMPINSTALL_FILES =
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(mkdir_p) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/linkcmds: linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am
deleted file mode 100644
index 9c3ee44a1c..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-# FIXME: this does not make much sense
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS = $(top_srcdir)/../../powerpc/shared/vectors/vectors.h
-
-powerpc_shared_vectors_C_FILES = \
- $(top_srcdir)/../../powerpc/shared/vectors/vectors_init.c
-OBJS = \
- $(powerpc_shared_vectors_C_FILES:$(top_srcdir)/../../powerpc/shared/vectors/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/vectors/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-powerpc_shared_vectors_S_FILES = \
- $(top_srcdir)/../../powerpc/shared/vectors/vectors.S
-OBJS += \
- $(powerpc_shared_vectors_S_FILES:$(top_srcdir)/../../powerpc/shared/vectors/%.S=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/vectors/%.S $(ARCH)/$(dirstamp)
- ${CCASCOMPILE} -o $@ -c $<
-
-noinst_DATA = $(OBJS)
-
-all-local: $(PREINSTALL_FILES)
-
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(mkdir_p) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/vectors.h: $(top_srcdir)/../../powerpc/shared/vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/.cvsignore b/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 320abffbd6..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-include_bspdir = $(includedir)/bsp
-
-include_bsp_HEADERS = $(top_srcdir)/../../shared/vmeUniverse/vmeUniverse.h
-shared_vmeUniverse_C_FILES = \
- $(top_srcdir)/../../shared/vmeUniverse/vmeUniverse.c
-OBJS = \
- $(shared_vmeUniverse_C_FILES:$(top_srcdir)/../../shared/vmeUniverse/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/vmeUniverse/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-include_bsp_HEADERS += $(top_srcdir)/../../powerpc/shared/vme/VMEConfig.h
-include_bsp_HEADERS += $(top_srcdir)/../../powerpc/shared/vme/VME.h
-powerpc_shared_vme_C_FILES = \
- $(top_srcdir)/../../powerpc/shared/vme/vmeconfig.c
-OBJS += \
- $(powerpc_shared_vme_C_FILES:$(top_srcdir)/../../powerpc/shared/vme/%.c=$(ARCH)/%.$(OBJEXT))
-
-$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/vme/%.c $(ARCH)/$(dirstamp)
- ${COMPILE} -o $@ -c $<
-
-noinst_DATA = $(OBJS)
-
-all-local: $(PREINSTALL_FILES)
-
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(mkdir_p) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: $(top_srcdir)/../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-
-$(PROJECT_INCLUDE)/bsp/VMEConfig.h: $(top_srcdir)/../../powerpc/shared/vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-
-$(PROJECT_INCLUDE)/bsp/VME.h: $(top_srcdir)/../../powerpc/shared/vme/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
-
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-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 89ed3c2caa..3dfa42fcc4 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
@@ -2,12 +2,14 @@
## $Id$
##
-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)) \
- $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
+OBJS = ../startup$(LIB_VARIANT).rel ../pclock$(LIB_VARIANT).rel \
+ ../console$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \
+ ../openpic$(LIB_VARIANT).rel ../pci$(LIB_VARIANT).rel \
+ ../residual$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel \
+ ../motorola$(LIB_VARIANT).rel ../vme$(LIB_VARIANT).rel
+OBJS += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \
+ ../../../../libcpu/@RTEMS_CPU@/shared/stack$(LIB_VARIANT).rel \
../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \
../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock$(LIB_VARIANT).rel \
../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions$(LIB_VARIANT).rel \