RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2009-12-09 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* startup/bspgetworkarea.c: Add debug printk's.
	* startup/linkcmds: Using "-Wl,--defsym -Wl,RamSize=0x1000000"
	results in _RamSize being defined.  Handle this properly.
This commit is contained in:
Joel Sherrill
2009-12-09 22:37:12 +00:00
parent 7b21633853
commit 9559674bcd
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/lib/libbsp/i386/pc386/ChangeLog
View File

@@ -1,3 +1,11 @@
2009-12-09 Joel Sherrill <joel.sherrill@oarcorp.com>
* startup/bspgetworkarea.c: Add debug printk's.
* startup/linkcmds: Using "-Wl,--defsym -Wl,RamSize=0x1000000"
results in _RamSize being defined. Handle this properly.
2009-12-08 Joel Sherrill <joel.sherrill@oarcorp.com> 2009-12-08 Joel Sherrill <joel.sherrill@oarcorp.com>
* include/bsp.h: BSP should not define * include/bsp.h: BSP should not define

22
c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c
View File

@@ -13,9 +13,14 @@
* $Id$ * $Id$
*/ */
/* #define BSP_GET_WORK_AREA_DEBUG */
#include <bsp.h> #include <bsp.h>
#include <bsp/bootcard.h> #include <bsp/bootcard.h>
#ifdef BSP_GET_WORK_AREA_DEBUG
#include <rtems/bspIo.h>
#endif
/* /*
* These are provided by the linkcmds. * These are provided by the linkcmds.
*/ */
@@ -74,6 +79,9 @@ void bsp_size_memory(void)
(_boot_multiboot_info.flags & 1) && (_boot_multiboot_info.flags & 1) &&
_boot_multiboot_info.mem_upper ) { _boot_multiboot_info.mem_upper ) {
bsp_mem_size = _boot_multiboot_info.mem_upper * 1024; bsp_mem_size = _boot_multiboot_info.mem_upper * 1024;
#ifdef BSP_GET_WORK_AREA_DEBUG
printk( "Multiboot info says we have 0x%08x\n", bsp_mem_size );
#endif
} }
if ( (uintptr_t) RamSize == (uintptr_t) 0xFFFFFFFF ) { if ( (uintptr_t) RamSize == (uintptr_t) 0xFFFFFFFF ) {
@@ -89,16 +97,21 @@ void bsp_size_memory(void)
for(i=lowest; i<=2048; i++) { for(i=lowest; i<=2048; i++) {
topAddr = i*1024*1024 - 4; topAddr = i*1024*1024 - 4;
val = *(uint32_t*)topAddr; val = *(volatile uint32_t*)topAddr;
if (val != topAddr) { if (val != topAddr) {
break; break;
} }
} }
topAddr = (i-1)*1024*1024 - 4; topAddr = (i-1)*1024*1024 - 4;
#ifdef BSP_GET_WORK_AREA_DEBUG
printk( "Dynamically sized to 0x%08x\n", topAddr );
#endif
} else { } else {
printk( "hardcoded\n" );
topAddr = (uintptr_t) RamSize; topAddr = (uintptr_t) RamSize;
#ifdef BSP_GET_WORK_AREA_DEBUG
printk( "hardcoded to 0x%08x\n", topAddr );
#endif
} }
bsp_mem_size = topAddr; bsp_mem_size = topAddr;
@@ -120,10 +133,13 @@ void bsp_get_work_area(
*heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA; *heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
*heap_size = (uintptr_t) HeapSize; *heap_size = (uintptr_t) HeapSize;
#if 0 #ifdef BSP_GET_WORK_AREA_DEBUG
printk( "bsp_mem_size = 0x%08x\n", bsp_mem_size );
printk( "rtemsFreeMemStart = 0x%08x\n", rtemsFreeMemStart );
printk( "WorkArea Base = %p\n", *work_area_start ); printk( "WorkArea Base = %p\n", *work_area_start );
printk( "WorkArea Size = 0x%08x\n", *work_area_size ); printk( "WorkArea Size = 0x%08x\n", *work_area_size );
printk( "C Program Heap Base = %p\n", *heap_start ); printk( "C Program Heap Base = %p\n", *heap_start );
printk( "C Program Heap Size = 0x%08x\n", *heap_size ); printk( "C Program Heap Size = 0x%08x\n", *heap_size );
printk( "End of WorkArea = %p\n", *work_area_start + *work_area_size );
#endif #endif
} }

6
c/src/lib/libbsp/i386/pc386/startup/linkcmds
View File

@@ -17,8 +17,10 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386",
OUTPUT_ARCH(i386) OUTPUT_ARCH(i386)
ENTRY(_start) ENTRY(_start)
*/ */
HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; HeapSize = DEFINED(HeapSize) ? HeapSize :
RamSize = DEFINED(RamSize) ? RamSize : 0xFFFFFFFF; DEFINED(_HeapSize) ? _HeapSize : 0x0;
RamSize = DEFINED(RamSize) ? RamSize :
DEFINED(_RamSize) ? _RamSize : 0xFFFFFFFF;
SECTIONS SECTIONS
{ {