2009-05-05 Jennifer Averett <jennifer.averett@OARcorp.com>

	* Makefile.am, configure.ac, preinstall.am, PCI_bus/PCI.c,
	PCI_bus/PCI.h, PCI_bus/flash.c, PCI_bus/universe.c, console/85c30.c,
	console/85c30.h, console/console.c, console/consolebsp.h,
	console/tbl85c30.c, include/bsp.h, include/gen2.h,
	include/irq-config.h, include/tm27.h, irq/FPGA.c, irq/irq.h,
	irq/irq_init.c, start/start.S, startup/Hwr_init.c,
	startup/bspstart.c, startup/linkcmds, timer/timer.c, tod/tod.c,
	vme/VMEConfig.h: Updated and tested with latest interrupt source.
	Modified with latest memory allocation, but this needs testing.
	* irq/no_pic.c: New file.

1 files changed, 41 insertions, 53 deletions

diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am
index 4aa4420be1..4b996d81d8 100644
--- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am
@@ -5,8 +5,7 @@
 ACLOCAL_AMFLAGS = -I ../../../../aclocal
 
 include $(top_srcdir)/../../../../automake/compile.am
-
-include_bspdir = $(includedir)/bsp
+include $(top_srcdir)/../../bsp.am
 
 dist_project_lib_DATA = bsp_specs
 
@@ -17,70 +16,58 @@ nodist_include_HEADERS = include/bspopts.h
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
+include_bspdir = $(includedir)/bsp
+
 include_HEADERS += ../../shared/tod.h
 include_HEADERS += ../../shared/include/coverhd.h include/gen2.h
 
 ###
 dist_project_lib_DATA += startup/linkcmds
 
-noinst_LIBRARIES = libbspstart.a
-libbspstart_a_SOURCES = start/start.S
-project_lib_DATA = start.$(OBJEXT)
-
-libbspstart_a_SOURCES += ../../powerpc/shared/start/rtems_crti.S
-project_lib_DATA += rtems_crti.$(OBJEXT)
-
-noinst_LIBRARIES += libbsp.a
-libbsp_a_SOURCES =
-
-# startup
-libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \
+startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     startup/bspstart.c ../../powerpc/shared/startup/bspgetworkarea.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    startup/Hwr_init.c startup/genpvec.c ../../shared/gnatinstallhandler.c \
-    ../../powerpc/shared/showbats.c \
-    ../../shared/bsppretaskinghook.c
-
-# pclock
-libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
-# console
-libbsp_a_SOURCES += console/85c30.c console/85c30.h console/console.c \
+    ../../shared/bsppost.c  \
+    ../../shared/bootcard.c ../../shared/bsppretaskinghook.c \
+    startup/Hwr_init.c \
+    ../../powerpc/shared/startup/sbrk.c ../../shared/gnatinstallhandler.c \
+    ../../powerpc/shared/showbats.c
+
+pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c
+console_SOURCES = console/85c30.c console/85c30.h console/console.c \
     console/tbl85c30.c console/consolebsp.h
 
 include_bsp_HEADERS = ../../powerpc/shared/pci/pci.h \
-    PCI_bus/PCI.h ../../powerpc/shared/residual/residual.h \
-    ../../powerpc/shared/residual/pnp.h \
-    ../../powerpc/shared/console/consoleIo.h \
-    ../../shared/include/irq-generic.h include/irq-config.h
-# pci
-libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
+	PCI_bus/PCI.h \
+	../../powerpc/shared/residual/residual.h \
+	../../powerpc/shared/residual/pnp.h \
+	../../powerpc/shared/console/consoleIo.h 
+
+pci_SOURCES = PCI_bus/flash.c ../../powerpc/shared/pci/pci.c \
     ../../powerpc/shared/pci/pcifinddevice.c  PCI_bus/PCI.c  PCI_bus/universe.c
 
 include_bsp_HEADERS += irq/irq.h \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h
-# irq
-libbsp_a_SOURCES += include/irq-config.h irq/FPGA.c irq/irq.c  \
-    ../../shared/src/irq-generic.c ../../powerpc/shared/irq/irq_asm.S
-
-include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h
-# vectors
-libbsp_a_SOURCES += ../../powerpc/shared/vectors/vectors_init.c \
-    ../../powerpc/shared/vectors/vectors.S
-
-include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
-    ../../shared/vmeUniverse/vme_am_defs.h \
-    ../../shared/vmeUniverse/VME.h \
-    vme/VMEConfig.h \
-    ../../powerpc/shared/motorola/motorola.h \
-    ../../shared/vmeUniverse/vmeUniverseDMA.h\
-    ../../shared/vmeUniverse/bspVmeDmaList.h\
-    ../../shared/vmeUniverse/VMEDMA.h
-# vme
-libbsp_a_SOURCES += \
-    ../../shared/vmeUniverse/bspVmeDmaList.c \
-    ../../shared/vmeUniverse/vme_am_defs.h \
-	../shared/vme/vmeconfig.c 
+	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h \
+	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
+	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h
+
+irq_SOURCES =  irq/no_pic.c irq/irq_init.c \
+    irq/FPGA.c 
+
+vectors_SOURCES = 
+
+EXTRA_DIST = start/start.S
+start.$(OBJEXT): start/start.S
+	$(CPPASCOMPILE) -o $@ -c $<
+project_lib_DATA = start.$(OBJEXT)
+
+EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+	$(CPPASCOMPILE) -o $@ -c $<
+project_lib_DATA += rtems_crti.$(OBJEXT)
+
+noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES = $(pclock_SOURCES) $(console_SOURCES) $(irq_SOURCES) \
+    $(pci_SOURCES) $(vectors_SOURCES) $(startup_SOURCES) 
 
 libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
@@ -88,6 +75,7 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
      ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel