Changeset 1ef1a8c in rtems


Ignore:
Timestamp:
Jan 27, 2011, 11:25:19 AM (8 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
610d92c
Parents:
20109f30
Message:

2011-01-27 Sebastian Huber <sebastian.huber@…>

  • shared/bspgetworkarea.c: Use BSP_DISABLE_UBOOT_WORK_AREA_CONFIG and BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN options.
Location:
c/src/lib/libbsp/shared
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/shared/ChangeLog

    r20109f30 r1ef1a8c  
     12011-01-27      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        * shared/bspgetworkarea.c: Use BSP_DISABLE_UBOOT_WORK_AREA_CONFIG and
     4        BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN options.
     5
    162010-12-30      Sebastian Huber <sebastian.huber@embedded-brains.de>
    27
  • c/src/lib/libbsp/shared/bspgetworkarea.c

    r20109f30 r1ef1a8c  
    66 *  COPYRIGHT (c) 1989-2008.
    77 *  On-Line Applications Research Corporation (OAR).
     8 *
     9 *  Copyright (c) 2011 embedded brains GmbH.
    810 *
    911 *  The license and distribution terms for this file may be
     
    2123  #include <rtems/bspIo.h>
    2224#endif
     25#ifdef BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN
     26  #include <rtems/config.h>
     27#endif
     28
     29#if defined(HAS_UBOOT) && !defined(BSP_DISABLE_UBOOT_WORK_AREA_CONFIG)
     30  #define USE_UBOOT
     31#endif
    2332
    2433/*
     
    3140 *  We may get the size information from U-Boot or the linker scripts.
    3241 */
    33 #ifdef HAS_UBOOT
     42#ifdef USE_UBOOT
    3443  #include <bsp/u-boot.h>
    3544#else
    3645  extern char RamBase[];
    3746  extern char RamSize[];
    38 #endif /* HAS_UBOOT */
     47#endif
    3948
    4049/*
     
    5059)
    5160{
     61  uintptr_t work_base = (uintptr_t) WorkAreaBase;
    5262  uintptr_t ram_end;
    5363
    54   #ifdef HAS_UBOOT
     64  #ifdef USE_UBOOT
    5565    ram_end = (uintptr_t) bsp_uboot_board_info.bi_memstart +
    5666                          bsp_uboot_board_info.bi_memsize;
     
    5969  #endif
    6070
    61   *work_area_start = WorkAreaBase;
    62   *work_area_size  = ram_end - (uintptr_t) WorkAreaBase;
     71  #ifdef BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN
     72    work_base += Configuration.interrupt_stack_size;
     73  #endif
     74
     75  *work_area_start = (void *) work_base;
     76  *work_area_size  = ram_end - work_base;
    6377  *heap_start      = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
    6478  *heap_size       = (uintptr_t) HeapSize;
Note: See TracChangeset for help on using the changeset viewer.