2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com>

	* Makefile.am: Moved most of the remaining CPU Table fields to the
	Configuration Table. This included pretasking_hook, predriver_hook,
	postdriver_hook, idle_task, do_zero_of_workspace,
	extra_mpci_receive_server_stack, stack_allocate_hook, and
	stack_free_hook. As a side-effect of this effort some multiprocessing
	code was made conditional and some style clean up occurred.

4 files changed, 36 insertions, 8 deletions

diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog
index 25101f644b..edfdcd6780 100644
--- a/c/src/lib/libbsp/sparc/erc32/ChangeLog
+++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-03	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile.am: Moved most of the remaining CPU Table fields to the
+	Configuration Table. This included pretasking_hook, predriver_hook,
+	postdriver_hook, idle_task, do_zero_of_workspace,
+	extra_mpci_receive_server_stack, stack_allocate_hook, and
+	stack_free_hook. As a side-effect of this effort some multiprocessing
+	code was made conditional and some style clean up occurred.
+
 2007-11-26	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* clock/ckinit.c, include/bsp.h: Fix spacing.
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index ddb2c983b3..df19d12b9a 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -31,6 +31,7 @@ dist_project_lib_DATA += startup/linkcmds
 
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../sparc/shared/bspclean.c ../../shared/bsplibc.c \
+    ../../shared/bsppredriverhook.c \
     ../../shared/bsppost.c ../../sparc/shared/bspstart.c \
     ../../shared/bootcard.c ../../shared/sbrk.c startup/setvec.c \
     startup/spurious.c startup/erc32mec.c startup/boardinit.S
@@ -84,6 +85,7 @@ startup_rel-bootcard.o \
 startup_rel-bspclean.o \
 startup_rel-bsplibc.o \
 startup_rel-bsppost.o \
+startup_rel-bsppredriverhook.o \
 startup_rel-bspstart.o \
 startup_rel-erc32mec.o \
 startup_rel-sbrk.o \
diff --git a/c/src/lib/libbsp/sparc/leon2/ChangeLog b/c/src/lib/libbsp/sparc/leon2/ChangeLog
index befc3c0f3f..90f3b6c4eb 100644
--- a/c/src/lib/libbsp/sparc/leon2/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon2/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-03	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile.am: Moved most of the remaining CPU Table fields to the
+	Configuration Table. This included pretasking_hook, predriver_hook,
+	postdriver_hook, idle_task, do_zero_of_workspace,
+	extra_mpci_receive_server_stack, stack_allocate_hook, and
+	stack_free_hook. As a side-effect of this effort some multiprocessing
+	code was made conditional and some style clean up occurred.
+
 2007-11-30	Daniel Hellstrom <daniel@gaisler.com>
 
 	* rasta/rasta.c: LEON2 PCI RASTA driver. Changes RASTA PCI interrupt to
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 5a4c196f7e..5d5f3608fe 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -14,11 +14,19 @@ include_HEADERS += include/tm27.h
 include_HEADERS += include/rasta.h
 include_HEADERS += include/cchip.h
 include_HEADERS += ../../sparc/shared/include/ambapp.h
-include_HEADERS += ../../sparc/shared/include/grspw.h ../../sparc/shared/include/grspw_pci.h ../../sparc/shared/include/grspw_rasta.h
-include_HEADERS += ../../sparc/shared/include/occan.h ../../sparc/shared/include/occan_pci.h
-include_HEADERS += ../../sparc/shared/include/grcan.h ../../sparc/shared/include/grcan_rasta.h
-include_HEADERS += ../../sparc/shared/include/apbuart.h ../../sparc/shared/include/apbuart_pci.h ../../sparc/shared/include/apbuart_rasta.h
-include_HEADERS += ../../sparc/shared/include/b1553brm.h ../../sparc/shared/include/b1553brm_pci.h ../../sparc/shared/include/b1553brm_rasta.h
+include_HEADERS += ../../sparc/shared/include/grspw.h
+include_HEADERS += ../../sparc/shared/include/grspw_pci.h
+include_HEADERS += ../../sparc/shared/include/grspw_rasta.h
+include_HEADERS += ../../sparc/shared/include/occan.h
+include_HEADERS += ../../sparc/shared/include/occan_pci.h
+include_HEADERS += ../../sparc/shared/include/grcan.h
+include_HEADERS += ../../sparc/shared/include/grcan_rasta.h
+include_HEADERS += ../../sparc/shared/include/apbuart.h
+include_HEADERS += ../../sparc/shared/include/apbuart_pci.h
+include_HEADERS += ../../sparc/shared/include/apbuart_rasta.h
+include_HEADERS += ../../sparc/shared/include/b1553brm.h
+include_HEADERS += ../../sparc/shared/include/b1553brm_pci.h
+include_HEADERS += ../../sparc/shared/include/b1553brm_rasta.h
 include_HEADERS += ../../sparc/shared/include/debug_defs.h
 include_HEADERS += ../../sparc/shared/include/pci.h
 
@@ -44,9 +52,9 @@ dist_project_lib_DATA += startup/linkcmds
 
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../sparc/shared/bspclean.c ../../shared/bsplibc.c \
-    ../../shared/bsppost.c ../../sparc/shared/bspstart.c \
-    ../../shared/bootcard.c ../../shared/sbrk.c startup/setvec.c \
-    startup/spurious.c
+    ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
+    ../../sparc/shared/bspstart.c ../../shared/bootcard.c \
+    ../../shared/sbrk.c startup/setvec.c startup/spurious.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)