summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-10-02 13:50:44 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-10-02 13:50:44 +0000
commit92b338c091312b5a9a7c98ae82cd19999f1ad8ee (patch)
treec11c4b956aee5320f42939b11c0ca2e2182b1975 /c
parent2008-10-02 Ralf Corsepius <ralf.corsepius@rtems.org> (diff)
downloadrtems-92b338c091312b5a9a7c98ae82cd19999f1ad8ee.tar.bz2
2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, startup/bspgetworkarea.c: Turn = into +=.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/i386/pc386/ChangeLog4
-rw-r--r--c/src/lib/libbsp/i386/pc386/Makefile.am2
-rw-r--r--c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c3
3 files changed, 5 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index a98aa771e9..3b1c5da553 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * Makefile.am, startup/bspgetworkarea.c: Turn = into +=.
+
2008-10-01 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 0a7ea9346c..70cf8b577d 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -53,7 +53,7 @@ project_lib_DATA += start16.bin
dist_project_lib_DATA += startup/linkcmds
-noinst_LIBRARIES = libbsp.a
+noinst_LIBRARIES += libbsp.a
libbsp_a_SOURCES =
# clock
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c b/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c
index 8b407e07e7..9155713f96 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c
+++ b/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c
@@ -74,11 +74,9 @@ void bsp_size_memory(void)
(_boot_multiboot_info.flags & 1) &&
_boot_multiboot_info.mem_upper ) {
bsp_mem_size = _boot_multiboot_info.mem_upper * 1024;
- printk( "multiboot\n" );
}
if ( (uintptr_t) RamSize == (uintptr_t) 0xFFFFFFFF ) {
- printk( "sizing\n" );
/*
* We have to dynamically size memory. Memory size can be anything
* between no less than 2M and 2048M.
@@ -99,7 +97,6 @@ void bsp_size_memory(void)
topAddr = (i-1)*1024*1024 - 4;
} else {
- printk( "hardcoded\n" );
topAddr = (uintptr_t) RamSize;
}