2006-11-15 Joel Sherrill <joel@OARcorp.com>

	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
	file and simplified initialization.

36 files changed, 108 insertions, 18 deletions

diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog
index 686dcac8e5..553c42790f 100644
--- a/c/src/lib/libbsp/m68k/av5282/ChangeLog
+++ b/c/src/lib/libbsp/m68k/av5282/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am
index 99d3efd28e..a94ec0e517 100644
--- a/c/src/lib/libbsp/m68k/av5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am
@@ -30,7 +30,7 @@ startup_rel_SOURCES = startup/bspclean.c \
     ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../m68k/shared/m68kpretaskinghook.c \
     startup/init5282.c startup/bspstart.c \
-    ../../shared/bootcard.c ../../shared/main.c \
+    ../../shared/bootcard.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog
index 4ed78b9c79..8db844ae42 100644
--- a/c/src/lib/libbsp/m68k/csb360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am
index f790367392..a75c591d70 100644
--- a/c/src/lib/libbsp/m68k/csb360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am
@@ -32,7 +32,7 @@ noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../m68k/shared/m68kpretaskinghook.c \
     startup/bspstart.c startup/init5272.c ../../shared/bootcard.c \
-    ../../shared/main.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \
+    ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
diff --git a/c/src/lib/libbsp/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog
index bc9120bf3c..072f6f17f8 100644
--- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog
+++ b/c/src/lib/libbsp/m68k/dmv152/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/dmv152/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/Makefile.am
index b8a78b7a29..6a41ee2035 100644
--- a/c/src/lib/libbsp/m68k/dmv152/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/Makefile.am
@@ -28,7 +28,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \
+    ../../m68k/shared/m68kpretaskinghook.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c startup/vmeintr.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
index ec66fe1901..5f8c9273fd 100644
--- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am
index 70e48467c7..7d27496e1a 100644
--- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am
@@ -31,7 +31,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \
+    ../../m68k/shared/m68kpretaskinghook.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index e192f4bced..f94d53f50f 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
index 57cc8056c0..bc93f16ec1 100644
--- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
@@ -34,7 +34,7 @@ noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c startup/init68340.c \
     ../../shared/bootcard.c ../../m68k/shared/m68kpretaskinghook.c \
-    ../../shared/main.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \
+    ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     startup/dumpanic.c ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
index 1e5a0a6d8b..6ca9559ede 100644
--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index fb9241b944..8f6dafde53 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -30,7 +30,7 @@ noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/alloc360.c startup/bspclean.c \
     ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../m68k/shared/m68kpretaskinghook.c startup/bspstart.c \
-    startup/init68360.c ../../shared/bootcard.c ../../shared/main.c \
+    startup/init68360.c ../../shared/bootcard.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog
index c65a60c86a..a5745d4f4a 100644
--- a/c/src/lib/libbsp/m68k/idp/ChangeLog
+++ b/c/src/lib/libbsp/m68k/idp/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am
index 89f58ea713..4797c0efd3 100644
--- a/c/src/lib/libbsp/m68k/idp/Makefile.am
+++ b/c/src/lib/libbsp/m68k/idp/Makefile.am
@@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \
+    ../../m68k/shared/m68kpretaskinghook.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
index 0178acc4d4..2d84c0a809 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index 5a8b76f70e..4732dc152e 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -40,7 +40,7 @@ noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../m68k/shared/m68kpretaskinghook.c \
     startup/bspstart.c startup/init5206e.c ../../shared/bootcard.c \
-    ../../shared/main.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \
+    ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
diff --git a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
index 70c886de1e..acb1ff6e59 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
index 1c174751fe..4219db6c92 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
@@ -31,7 +31,7 @@ startup_rel_SOURCES = startup/bspclean.c \
     ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../m68k/shared/m68kpretaskinghook.c \
     startup/init5235.c startup/bspstart.c \
-    ../../shared/bootcard.c ../../shared/main.c \
+    ../../shared/bootcard.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
index 22d352f3f9..082c2fd7bd 100644
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 8a71053c23..9f45092eca 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -33,7 +33,7 @@ noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/start_c.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c startup/bspclean.c \
     ../../shared/bootcard.c ../../m68k/shared/m68kpretaskinghook.c \
-    ../../shared/main.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \
+    ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c startup/except_vect_332_ROM.S
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index 9951b7890e..8400327e24 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am
index 4fa18616d3..1ec81e70a7 100644
--- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am
@@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \
+    ../../m68k/shared/m68kpretaskinghook.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
index 0838af0d31..e3d8eec6ec 100644
--- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index 82fea159e5..efa87fc8b5 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \
+    ../../m68k/shared/m68kpretaskinghook.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog
index 01751086a9..2b28262a74 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index fe1672f0c6..0e2f2e855a 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \
+    ../../m68k/shared/m68kpretaskinghook.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index d5436335b9..604bbc782d 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index b32e257415..f6ade41bc0 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -37,7 +37,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \
+    ../../m68k/shared/m68kpretaskinghook.c \
     startup/page_table.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
index aaffe74ba4..d0a394f373 100644
--- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index e13cd076de..e6a08c67e0 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -33,7 +33,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \
+    ../../m68k/shared/m68kpretaskinghook.c \
     startup/page_table.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
index 2715522865..494b1750f3 100644
--- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am
index 6cb5db1486..f3947a5367 100644
--- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am
+++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am
@@ -41,7 +41,7 @@ dist_project_lib_DATA += startup/linkcmds startup/rom startup/debugger
 
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/cpuboot.c startup/crc.c startup/debugport.c \
-    startup/gdb-hooks.c ../../shared/bootcard.c ../../shared/main.c \
+    startup/gdb-hooks.c ../../shared/bootcard.c \
     startup/m68302scc.c startup/m68k-stub.c \
     ../../m68k/shared/m68kpretaskinghook.c startup/memcheck.c \
     startup/trace.c ../../shared/gnatinstallhandler.c ../../shared/bsplibc.c \
diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog
index deba51fa5b..f37092941f 100644
--- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog
+++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am
index 89aa1ff153..f1c7ccf00e 100644
--- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am
+++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am
@@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \
+    ../../m68k/shared/m68kpretaskinghook.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c ../../m68k/shared/bspspuriousinit.c \
     ../../m68k/shared/m68000spurious.c startup/spurious_assistant.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog
index 4794f73b0d..cf16e86076 100644
--- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog
+++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
+	file and simplified initialization.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove superfluous -DASM.
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index eb4d499097..914d630555 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
@@ -29,7 +29,7 @@ noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../m68k/shared/m68kpretaskinghook.c \
     startup/init5282.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/main.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \
+    ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)