diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-01-27 11:25:19 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-01-27 11:25:19 +0000 |
| commit | 1ef1a8c755903ee91c688f86581298db445e32ee (patch) | |
| tree | 42d6075e53add194ba6c296f0c40116af6554712 /c | |
| parent | 2011-01-26 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-1ef1a8c755903ee91c688f86581298db445e32ee.tar.bz2 | |
2011-01-27 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/bspgetworkarea.c: Use BSP_DISABLE_UBOOT_WORK_AREA_CONFIG and
BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN options.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/shared/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/shared/bspgetworkarea.c | 24 |
2 files changed, 24 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index ee584391f9..c053e98aff 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,3 +1,8 @@ +2011-01-27 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * shared/bspgetworkarea.c: Use BSP_DISABLE_UBOOT_WORK_AREA_CONFIG and + BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN options. + 2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de> * shared/bspgetworkarea.c: Include <bsp/u-boot.h> if necessary. diff --git a/c/src/lib/libbsp/shared/bspgetworkarea.c b/c/src/lib/libbsp/shared/bspgetworkarea.c index 3f9974f362..f7f7f36bea 100644 --- a/c/src/lib/libbsp/shared/bspgetworkarea.c +++ b/c/src/lib/libbsp/shared/bspgetworkarea.c @@ -6,6 +6,8 @@ * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * + * Copyright (c) 2011 embedded brains GmbH. + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. @@ -20,6 +22,13 @@ #ifdef BSP_GET_WORK_AREA_DEBUG #include <rtems/bspIo.h> #endif +#ifdef BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN + #include <rtems/config.h> +#endif + +#if defined(HAS_UBOOT) && !defined(BSP_DISABLE_UBOOT_WORK_AREA_CONFIG) + #define USE_UBOOT +#endif /* * These are provided by the linkcmds for ALL of the BSPs which use this file. @@ -30,12 +39,12 @@ extern char HeapSize[]; /* * We may get the size information from U-Boot or the linker scripts. */ -#ifdef HAS_UBOOT +#ifdef USE_UBOOT #include <bsp/u-boot.h> #else extern char RamBase[]; extern char RamSize[]; -#endif /* HAS_UBOOT */ +#endif /* * This method returns the base address and size of the area which @@ -49,17 +58,22 @@ void bsp_get_work_area( uintptr_t *heap_size ) { + uintptr_t work_base = (uintptr_t) WorkAreaBase; uintptr_t ram_end; - #ifdef HAS_UBOOT + #ifdef USE_UBOOT ram_end = (uintptr_t) bsp_uboot_board_info.bi_memstart + bsp_uboot_board_info.bi_memsize; #else ram_end = (uintptr_t)RamBase + (uintptr_t)RamSize; #endif - *work_area_start = WorkAreaBase; - *work_area_size = ram_end - (uintptr_t) WorkAreaBase; + #ifdef BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN + work_base += Configuration.interrupt_stack_size; + #endif + + *work_area_start = (void *) work_base; + *work_area_size = ram_end - work_base; *heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA; *heap_size = (uintptr_t) HeapSize; |