summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i386/i386ex
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/i386/i386ex/ChangeLog5
-rw-r--r--c/src/lib/libbsp/i386/i386ex/Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index b2f0a86749..35cbf07825 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/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/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am
index cc9676828c..03081a07e4 100644
--- a/c/src/lib/libbsp/i386/i386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/i386ex/Makefile.am
@@ -35,7 +35,7 @@ noinst_PROGRAMS += startup.rel
include_HEADERS += ../../i386/shared/comm/uart.h
startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
- ../../shared/main.c ../../shared/sbrk.c ../../i386/shared/irq/idt.c \
+ ../../shared/sbrk.c ../../i386/shared/irq/idt.c \
../../i386/shared/irq/irq.c ../../i386/shared/irq/irq_init.c \
../../i386/shared/comm/i386-stub.c \
../../i386/shared/comm/i386-stub-glue.c ../../i386/shared/comm/uart.c \