summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/csb360
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/m68k/csb360/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/csb360/Makefile.am2
2 files changed, 6 insertions, 1 deletions
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)