<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-01-27)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/shared/ChangeLog.diff?r1=text&tr1=1.180&r2=text&tr2=1.181&diff_format=h">M</a></td><td width='1%'>1.181</td><td width='100%'>c/src/lib/libbsp/shared/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/shared/bspgetworkarea.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>c/src/lib/libbsp/shared/bspgetworkarea.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/shared/ChangeLog:1.180 rtems/c/src/lib/libbsp/shared/ChangeLog:1.181
--- rtems/c/src/lib/libbsp/shared/ChangeLog:1.180 Thu Dec 30 06:58:39 2010
+++ rtems/c/src/lib/libbsp/shared/ChangeLog Thu Jan 27 05:25:19 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+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.
+
</font> 2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/bspgetworkarea.c: Include <bsp/u-boot.h> if necessary.
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/shared/bspgetworkarea.c:1.8 rtems/c/src/lib/libbsp/shared/bspgetworkarea.c:1.9
--- rtems/c/src/lib/libbsp/shared/bspgetworkarea.c:1.8 Thu Dec 30 06:58:39 2010
+++ rtems/c/src/lib/libbsp/shared/bspgetworkarea.c Thu Jan 27 05:25:19 2011
</font><font color='#997700'>@@ -6,6 +6,8 @@
</font> * COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
<font color='#000088'>+ * Copyright (c) 2011 embedded brains GmbH.
+ *
</font> * 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.
<font color='#997700'>@@ -20,6 +22,13 @@
</font> #ifdef BSP_GET_WORK_AREA_DEBUG
#include <rtems/bspIo.h>
#endif
<font color='#000088'>+#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
</font>
/*
* These are provided by the linkcmds for ALL of the BSPs which use this file.
<font color='#997700'>@@ -30,12 +39,12 @@
</font> /*
* We may get the size information from U-Boot or the linker scripts.
*/
<font color='#880000'>-#ifdef HAS_UBOOT
</font><font color='#000088'>+#ifdef USE_UBOOT
</font> #include <bsp/u-boot.h>
#else
extern char RamBase[];
extern char RamSize[];
<font color='#880000'>-#endif /* HAS_UBOOT */
</font><font color='#000088'>+#endif
</font>
/*
* This method returns the base address and size of the area which
<font color='#997700'>@@ -49,17 +58,22 @@
</font> uintptr_t *heap_size
)
{
<font color='#000088'>+ uintptr_t work_base = (uintptr_t) WorkAreaBase;
</font> uintptr_t ram_end;
<font color='#880000'>- #ifdef HAS_UBOOT
</font><font color='#000088'>+ #ifdef USE_UBOOT
</font> 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
<font color='#880000'>- *work_area_start = WorkAreaBase;
- *work_area_size = ram_end - (uintptr_t) WorkAreaBase;
</font><font color='#000088'>+ #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;
</font> *heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
*heap_size = (uintptr_t) HeapSize;
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>