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

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

12 files changed, 36 insertions, 6 deletions

diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog
index ee67152379..039a8add34 100644
--- a/c/src/lib/libbsp/arm/armulator/ChangeLog
+++ b/c/src/lib/libbsp/arm/armulator/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-30	Joel Sherrill <joel@OARcorp.com>
 
 	* bsp_specs: Add crti, crtbegin, crtend, and crtn.
diff --git a/c/src/lib/libbsp/arm/armulator/Makefile.am b/c/src/lib/libbsp/arm/armulator/Makefile.am
index 324d1ac0bf..0b417da47c 100644
--- a/c/src/lib/libbsp/arm/armulator/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/Makefile.am
@@ -28,7 +28,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/trap.S ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/main.c ../../shared/sbrk.c \
+    ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c startup/libcfunc.c startup/syscalls.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog
index 9886af8f9a..bb2a729a11 100644
--- a/c/src/lib/libbsp/arm/csb336/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb336/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-11-01	Joel Sherrill <joel@OARcorp.com>
 
 	* bsp_specs: Fix typo.
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 8043bf1545..55e13fdc2f 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -28,7 +28,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     startup/bspstart.c startup/exit.c startup/memmap.c \
-    ../../shared/bootcard.c ../../shared/main.c ../../shared/sbrk.c \
+    ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog
index 67164f0b95..860171044c 100644
--- a/c/src/lib/libbsp/arm/csb337/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb337/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-11-01	Joel Sherrill <joel@OARcorp.com>
 
 	* bsp_specs: Fix typo.
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 2284c4d6b2..9104f25f0e 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -28,7 +28,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     startup/bspstart.c startup/exit.c startup/memmap.c \
-    ../../shared/bootcard.c ../../shared/main.c ../../shared/sbrk.c \
+    ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog
index 5642b95e2e..bfdcdbe933 100644
--- a/c/src/lib/libbsp/arm/edb7312/ChangeLog
+++ b/c/src/lib/libbsp/arm/edb7312/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-11-01	Joel Sherrill <joel@OARcorp.com>
 
 	* bsp_specs: Fix typo.
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index 9c5515f7cf..f530b4e52b 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -30,7 +30,7 @@ noinst_PROGRAMS += startup.rel
 include_HEADERS += ../../arm/shared/comm/uart.h
 startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     startup/bspstart.c startup/exit.c ../../shared/bootcard.c \
-    ../../shared/main.c ../../shared/sbrk.c \
+    ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog
index d308943f6c..c56e4e1b0b 100644
--- a/c/src/lib/libbsp/arm/gba/ChangeLog
+++ b/c/src/lib/libbsp/arm/gba/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/arm/gba/Makefile.am b/c/src/lib/libbsp/arm/gba/Makefile.am
index 13667dbb2b..c915437d0a 100644
--- a/c/src/lib/libbsp/arm/gba/Makefile.am
+++ b/c/src/lib/libbsp/arm/gba/Makefile.am
@@ -32,7 +32,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     startup/bspstart.c startup/exit.c startup/cpu.c startup/cpu_asm.S \
-    ../../shared/bootcard.c ../../shared/main.c ../../shared/sbrk.c \
+    ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog
index 2c54d95c35..eb94f1d8fe 100644
--- a/c/src/lib/libbsp/arm/gp32/ChangeLog
+++ b/c/src/lib/libbsp/arm/gp32/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/arm/gp32/Makefile.am b/c/src/lib/libbsp/arm/gp32/Makefile.am
index 85b937d902..be2724b393 100644
--- a/c/src/lib/libbsp/arm/gp32/Makefile.am
+++ b/c/src/lib/libbsp/arm/gp32/Makefile.am
@@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     startup/bspstart.c startup/exit.c startup/memmap.c \
-    ../../shared/bootcard.c ../../shared/main.c ../../shared/sbrk.c \
+    ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)