<!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-06-07)</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-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
* configure.ac, startup/start.S: Use standard cache BSP options.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog.diff?r1=text&tr1=1.65&r2=text&tr2=1.66&diff_format=h">M</a></td><td width='1%'>1.66</td><td width='100%'>c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac.diff?r1=text&tr1=1.16&r2=text&tr2=1.17&diff_format=h">M</a></td><td width='1%'>1.17</td><td width='100%'>c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S.diff?r1=text&tr1=1.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</td><td width='100%'>c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog:1.65 rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog:1.66
--- rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog:1.65 Tue Jun 7 04:14:05 2011
+++ rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog Tue Jun 7 08:30:45 2011
</font><font color='#997700'>@@ -1,5 +1,9 @@
</font> 2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
<font color='#000088'>+ * configure.ac, startup/start.S: Use standard cache BSP options.
+
+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
</font> * clock/clock-config.c: Fixes to pass psnsext01.
* startup/bspstart.c: Workaround for GCC 4.6 bug.
* include/smsc9218i.h, network/smsc9218i.c, Makefile.am: Changes
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac:1.16 rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac:1.17
--- rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac:1.16 Wed Feb 2 09:00:06 2011
+++ rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac Tue Jun 7 08:30:46 2011
</font><font color='#997700'>@@ -23,19 +23,15 @@
</font> RTEMS_CHECK_NETWORKING
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
<font color='#880000'>-RTEMS_BSPOPTS_SET([DATA_CACHE_ENABLE],[gwlcfm],[])
-RTEMS_BSPOPTS_SET([DATA_CACHE_ENABLE],[mpc5566evb],[1])
-RTEMS_BSPOPTS_SET([DATA_CACHE_ENABLE],[*],[1])
-RTEMS_BSPOPTS_HELP([DATA_CACHE_ENABLE],
-[If defined, the data cache will be enabled after address translation
- is turned on.])
-
-RTEMS_BSPOPTS_SET([INSTRUCTION_CACHE_ENABLE],[gwlcfm],[])
-RTEMS_BSPOPTS_SET([INSTRUCTION_CACHE_ENABLE],[mpc5566evb],[1])
-RTEMS_BSPOPTS_SET([INSTRUCTION_CACHE_ENABLE],[*],[1])
-RTEMS_BSPOPTS_HELP([INSTRUCTION_CACHE_ENABLE],
-[If defined, the instruction cache will be enabled after address translation
- is turned on.])
</font><font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([gwlcfm],[])
+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([mpc5566evb],[1])
+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([gwlcfm],[])
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([mpc5566evb],[1])
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
</font>
RTEMS_BSPOPTS_SET([UARTS_USE_TERMIOS],[*],[])
RTEMS_BSPOPTS_HELP([UARTS_USE_TERMIOS],
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S:1.7 rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S:1.8
--- rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S:1.7 Wed Dec 29 04:54:57 2010
+++ rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S Tue Jun 7 08:30:47 2011
</font><font color='#997700'>@@ -83,10 +83,10 @@
</font> /* Config internal flash */
bl SYM (mpc55xx_flash_config)
<font color='#880000'>-#if DATA_CACHE_ENABLE || INSTRUCTION_CACHE_ENABLE
</font><font color='#000088'>+#if BSP_DATA_CACHE_ENABLED || BSP_INSTRUCTION_CACHE_ENABLED
</font> /* FIXME: Config cache */
bl config_cache
<font color='#880000'>-#endif /* DATA_CACHE_ENABLE || INSTRUCTION_CACHE_ENABLE */
</font><font color='#000088'>+#endif /* BSP_DATA_CACHE_ENABLED || BSP_INSTRUCTION_CACHE_ENABLED */
</font>
/*
* TODO, FIXME: Enable cache in the MMU for the SRAM
</pre>
<p> </p>
<a name='cs2'></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-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
* configure.ac, startup/bspstart.c, include/coverhd.h: Use standard
cache BSP options.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog.diff?r1=text&tr1=1.175&r2=text&tr2=1.176&diff_format=h">M</a></td><td width='1%'>1.176</td><td width='100%'>c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac.diff?r1=text&tr1=1.34&r2=text&tr2=1.35&diff_format=h">M</a></td><td width='1%'>1.35</td><td width='100%'>c/src/lib/libbsp/powerpc/mbx8xx/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mbx8xx/include/coverhd.h.diff?r1=text&tr1=1.6&r2=text&tr2=1.7&diff_format=h">M</a></td><td width='1%'>1.7</td><td width='100%'>c/src/lib/libbsp/powerpc/mbx8xx/include/coverhd.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c.diff?r1=text&tr1=1.31&r2=text&tr2=1.32&diff_format=h">M</a></td><td width='1%'>1.32</td><td width='100%'>c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog:1.175 rtems/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog:1.176
--- rtems/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog:1.175 Fri Feb 11 06:46:34 2011
+++ rtems/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog Tue Jun 7 08:32:31 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * configure.ac, startup/bspstart.c, include/coverhd.h: Use standard
+ cache BSP options.
+
</font> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* console/console.c, irq/irq.c:
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac:1.34 rtems/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac:1.35
--- rtems/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac:1.34 Wed Feb 2 09:00:02 2011
+++ rtems/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac Tue Jun 7 08:32:31 2011
</font><font color='#997700'>@@ -18,22 +18,12 @@
</font> RTEMS_CHECK_NETWORKING
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
<font color='#880000'>-RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[mbx860_005b],[0])
-RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[1])
-RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
-[If defined, then the PowerPC specific code in RTEMS will use
- data cache instructions to optimize the context switch code.
- This code can conflict with debuggers or emulators.])
-
-RTEMS_BSPOPTS_SET([DATA_CACHE_ENABLE],[*],[1])
-RTEMS_BSPOPTS_HELP([DATA_CACHE_ENABLE],
-[If defined, the data cache will be enabled after address translation
- is turned on.])
-
-RTEMS_BSPOPTS_SET([INSTRUCTION_CACHE_ENABLE],[*],[1])
-RTEMS_BSPOPTS_HELP([INSTRUCTION_CACHE_ENABLE],
-[If defined, the instruction cache will be enabled after address translation
- is turned on.])
</font><font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([mbx860_005b],[])
+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
</font>
RTEMS_BSPOPTS_SET([NVRAM_CONFIGURE],[mbx860_005b],[0])
RTEMS_BSPOPTS_SET([NVRAM_CONFIGURE],[*],[1])
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mbx8xx/include/coverhd.h:1.6 rtems/c/src/lib/libbsp/powerpc/mbx8xx/include/coverhd.h:1.7
--- rtems/c/src/lib/libbsp/powerpc/mbx8xx/include/coverhd.h:1.6 Fri Mar 17 04:11:37 2006
+++ rtems/c/src/lib/libbsp/powerpc/mbx8xx/include/coverhd.h Tue Jun 7 08:32:31 2011
</font><font color='#997700'>@@ -32,7 +32,7 @@
</font> #endif
#if ( defined(mbx821_001) || defined(mbx821_001b) || defined(mbx860_001b) )
<font color='#880000'>-#if defined( INSTRUCTION_CACHE_ENABLE )
</font><font color='#000088'>+#if BSP_INSTRUCTION_CACHE_ENABLED
</font> /*
* 50 MHz processor, cache enabled.
*/
<font color='#997700'>@@ -190,10 +190,10 @@
</font> #define CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD 5
#define CALLING_OVERHEAD_MULTIPROCESSING_ANNOUNCE 3
<font color='#880000'>-#endif /* defined( INSTRUCTION_CACHE_ENABLE ) */
</font><font color='#000088'>+#endif /* BSP_INSTRUCTION_CACHE_ENABLED */
</font>
#else
<font color='#880000'>-#if defined( INSTRUCTION_CACHE_ENABLE )
</font><font color='#000088'>+#if BSP_INSTRUCTION_CACHE_ENABLED
</font> /*
* 40 MHz processor, cache enabled.
*/
<font color='#997700'>@@ -351,7 +351,7 @@
</font> #define CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD 4
#define CALLING_OVERHEAD_MULTIPROCESSING_ANNOUNCE 3
<font color='#880000'>-#endif /* defined( INSTRUCTION_CACHE_ENABLE ) */
</font><font color='#000088'>+#endif /* BSP_INSTRUCTION_CACHE_ENABLED */
</font>
#endif
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c:1.31 rtems/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c:1.32
--- rtems/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c:1.31 Sun Apr 25 17:36:25 2010
+++ rtems/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c Tue Jun 7 08:32:31 2011
</font><font color='#997700'>@@ -106,10 +106,10 @@
</font> if ( nvram->cache_mode & 0x01 )
rtems_cache_enable_data();
#else
<font color='#880000'>-#ifdef INSTRUCTION_CACHE_ENABLE
</font><font color='#000088'>+#if BSP_INSTRUCTION_CACHE_ENABLED
</font> rtems_cache_enable_instruction();
#endif
<font color='#880000'>-#ifdef DATA_CACHE_ENABLE
</font><font color='#000088'>+#if BSP_DATA_CACHE_ENABLED
</font> rtems_cache_enable_data();
#endif
#endif
</pre>
<p> </p>
<a name='cs3'></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-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
* configure.ac: Use standard cache BSP options.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog.diff?r1=text&tr1=1.19&r2=text&tr2=1.20&diff_format=h">M</a></td><td width='1%'>1.20</td><td width='100%'>c/src/lib/libbsp/powerpc/beatnik/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>c/src/lib/libbsp/powerpc/beatnik/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog.diff?r1=text&tr1=1.93&r2=text&tr2=1.94&diff_format=h">M</a></td><td width='1%'>1.94</td><td width='100%'>c/src/lib/libbsp/powerpc/ep1a/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac.diff?r1=text&tr1=1.16&r2=text&tr2=1.17&diff_format=h">M</a></td><td width='1%'>1.17</td><td width='100%'>c/src/lib/libbsp/powerpc/ep1a/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog.diff?r1=text&tr1=1.159&r2=text&tr2=1.160&diff_format=h">M</a></td><td width='1%'>1.160</td><td width='100%'>c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac.diff?r1=text&tr1=1.37&r2=text&tr2=1.38&diff_format=h">M</a></td><td width='1%'>1.38</td><td width='100%'>c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog.diff?r1=text&tr1=1.55&r2=text&tr2=1.56&diff_format=h">M</a></td><td width='1%'>1.56</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme3100/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac.diff?r1=text&tr1=1.12&r2=text&tr2=1.13&diff_format=h">M</a></td><td width='1%'>1.13</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme3100/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog.diff?r1=text&tr1=1.128&r2=text&tr2=1.129&diff_format=h">M</a></td><td width='1%'>1.129</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme5500/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac.diff?r1=text&tr1=1.18&r2=text&tr2=1.19&diff_format=h">M</a></td><td width='1%'>1.19</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme5500/configure.ac</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog:1.19 rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog:1.20
--- rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog:1.19 Wed May 18 00:26:52 2011
+++ rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog Tue Jun 7 08:35:15 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * configure.ac: Use standard cache BSP options.
+
</font> 2011-05-17 Till Straumann <strauman@slac.stanford.edu>
PR1797/bsps
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac:1.5 rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac:1.6
--- rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac:1.5 Wed May 18 00:26:52 2011
+++ rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac Tue Jun 7 08:35:15 2011
</font><font color='#997700'>@@ -23,14 +23,11 @@
</font> AS=$CC
AM_PROG_AS
<font color='#880000'>-RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[1])
-RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
-[If defined, then the PowerPC specific code in RTEMS will use
- data cache instructions to optimize the context switch code.
- This code can conflict with debuggers or emulators. It is known
- to break the Corelis PowerPC emulator with at least some combinations
- of PowerPC 603e revisions and emulator versions.
- The BSP actually contains the call that enables this.])
</font><font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
</font>
RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog:1.93 rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog:1.94
--- rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog:1.93 Wed May 18 00:26:53 2011
+++ rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog Tue Jun 7 08:35:43 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * configure.ac: Use standard cache BSP options.
+
</font> 2011-05-17 Till Straumann <strauman@slac.stanford.edu>
PR1797/bsps
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac:1.16 rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac:1.17
--- rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac:1.16 Wed May 18 00:26:53 2011
+++ rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac Tue Jun 7 08:35:43 2011
</font><font color='#997700'>@@ -15,19 +15,11 @@
</font> RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
<font color='#880000'>-RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[0])
-RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
-[If defined, then the PowerPC specific code in RTEMS will use
- data cache instructions to optimize the context switch code.
- This code can conflict with debuggers or emulators. It is known
- to break the Corelis PowerPC emulator with at least some combinations
- of PowerPC 603e revisions and emulator versions.
- The BSP actually contains the call that enables this.])
-
-RTEMS_BSPOPTS_SET([INSTRUCTION_CACHE_ENABLE],[*],[0])
-RTEMS_BSPOPTS_HELP([INSTRUCTION_CACHE_ENABLE],
-[If defined, the instruction cache will be enabled after address translation
- is turned on.])
</font><font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
</font>
RTEMS_BSPOPTS_SET([CONSOLE_USE_INTERRUPTS],[*],[0])
RTEMS_BSPOPTS_HELP([CONSOLE_USE_INTERRUPTS],
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog:1.159 rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog:1.160
--- rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog:1.159 Wed May 18 00:26:52 2011
+++ rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog Tue Jun 7 08:33:18 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * configure.ac: Use standard cache BSP options.
+
</font> 2011-05-17 Till Straumann <strauman@slac.stanford.edu>
PR1797/bsps
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac:1.37 rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac:1.38
--- rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac:1.37 Wed May 18 00:26:52 2011
+++ rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac Tue Jun 7 08:33:18 2011
</font><font color='#997700'>@@ -22,14 +22,11 @@
</font> AS=$CC
AM_PROG_AS
<font color='#880000'>-RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[1])
-RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
-[If defined, then the PowerPC specific code in RTEMS will use
- data cache instructions to optimize the context switch code.
- This code can conflict with debuggers or emulators. It is known
- to break the Corelis PowerPC emulator with at least some combinations
- of PowerPC 603e revisions and emulator versions.
- The BSP actually contains the call that enables this.])
</font><font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
</font>
RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog:1.55 rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog:1.56
--- rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog:1.55 Wed May 18 00:26:52 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog Tue Jun 7 08:27:06 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * configure.ac: Use standard cache BSP options.
+
</font> 2011-05-17 Till Straumann <strauman@slac.stanford.edu>
PR1797/bsps
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac:1.12 rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac:1.13
--- rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac:1.12 Wed May 18 00:26:52 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac Tue Jun 7 08:27:06 2011
</font><font color='#997700'>@@ -26,14 +26,11 @@
</font> dnl AM_CONDITIONAL([AMPOLISH3],[test x"$USE_MAINTAINER_MODE" = x"yes" \
dnl && test -n "$AMPOLISH3"])
<font color='#880000'>-RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[1])
-RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
-[If defined, then the PowerPC specific code in RTEMS will use
- data cache instructions to optimize the context switch code.
- This code can conflict with debuggers or emulators. It is known
- to break the Corelis PowerPC emulator with at least some combinations
- of PowerPC 603e revisions and emulator versions.
- The BSP actually contains the call that enables this.])
</font><font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
</font>
RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.128 rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.129
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.128 Wed May 18 00:26:52 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog Tue Jun 7 08:26:40 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * configure.ac: Use standard cache BSP options.
+
</font> 2011-05-17 Till Straumann <strauman@slac.stanford.edu>
PR1797/bsps
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac:1.18 rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac:1.19
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac:1.18 Wed May 18 00:26:52 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac Tue Jun 7 08:26:40 2011
</font><font color='#997700'>@@ -22,14 +22,11 @@
</font> AS=$CC
AM_PROG_AS
<font color='#880000'>-RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[1])
-RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
-[If defined, then the PowerPC specific code in RTEMS will use
- data cache instructions to optimize the context switch code.
- This code can conflict with debuggers or emulators. It is known
- to break the Corelis PowerPC emulator with at least some combinations
- of PowerPC 603e revisions and emulator versions.
- The BSP actually contains the call that enables this.])
</font><font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
</font>
RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
</pre>
<p> </p>
<a name='cs4'></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-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
* configure.ac, startup/bspstart.c: Use standard cache BSP options.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen5200/ChangeLog.diff?r1=text&tr1=1.154&r2=text&tr2=1.155&diff_format=h">M</a></td><td width='1%'>1.155</td><td width='100%'>c/src/lib/libbsp/powerpc/gen5200/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen5200/configure.ac.diff?r1=text&tr1=1.20&r2=text&tr2=1.21&diff_format=h">M</a></td><td width='1%'>1.21</td><td width='100%'>c/src/lib/libbsp/powerpc/gen5200/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c.diff?r1=text&tr1=1.31&r2=text&tr2=1.32&diff_format=h">M</a></td><td width='1%'>1.32</td><td width='100%'>c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog.diff?r1=text&tr1=1.103&r2=text&tr2=1.104&diff_format=h">M</a></td><td width='1%'>1.104</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/configure.ac.diff?r1=text&tr1=1.17&r2=text&tr2=1.18&diff_format=h">M</a></td><td width='1%'>1.18</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c.diff?r1=text&tr1=1.31&r2=text&tr2=1.32&diff_format=h">M</a></td><td width='1%'>1.32</td><td width='100%'>c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog.diff?r1=text&tr1=1.155&r2=text&tr2=1.156&diff_format=h">M</a></td><td width='1%'>1.156</td><td width='100%'>c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac.diff?r1=text&tr1=1.35&r2=text&tr2=1.36&diff_format=h">M</a></td><td width='1%'>1.36</td><td width='100%'>c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c.diff?r1=text&tr1=1.26&r2=text&tr2=1.27&diff_format=h">M</a></td><td width='1%'>1.27</td><td width='100%'>c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog.diff?r1=text&tr1=1.187&r2=text&tr2=1.188&diff_format=h">M</a></td><td width='1%'>1.188</td><td width='100%'>c/src/lib/libbsp/powerpc/score603e/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac.diff?r1=text&tr1=1.38&r2=text&tr2=1.39&diff_format=h">M</a></td><td width='1%'>1.39</td><td width='100%'>c/src/lib/libbsp/powerpc/score603e/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c.diff?r1=text&tr1=1.37&r2=text&tr2=1.38&diff_format=h">M</a></td><td width='1%'>1.38</td><td width='100%'>c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen5200/ChangeLog:1.154 rtems/c/src/lib/libbsp/powerpc/gen5200/ChangeLog:1.155
--- rtems/c/src/lib/libbsp/powerpc/gen5200/ChangeLog:1.154 Fri Feb 11 06:46:30 2011
+++ rtems/c/src/lib/libbsp/powerpc/gen5200/ChangeLog Tue Jun 7 08:38:54 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * configure.ac, startup/bspstart.c: Use standard cache BSP options.
+
</font> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* include/tm27.h:
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen5200/configure.ac:1.20 rtems/c/src/lib/libbsp/powerpc/gen5200/configure.ac:1.21
--- rtems/c/src/lib/libbsp/powerpc/gen5200/configure.ac:1.20 Wed Feb 2 08:59:57 2011
+++ rtems/c/src/lib/libbsp/powerpc/gen5200/configure.ac Tue Jun 7 08:38:54 2011
</font><font color='#997700'>@@ -15,15 +15,11 @@
</font> RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
<font color='#880000'>-RTEMS_BSPOPTS_SET([DATA_CACHE_ENABLE],[*],[1])
-RTEMS_BSPOPTS_HELP([DATA_CACHE_ENABLE],
-[If defined, the data cache will be enabled after address translation
- is turned on.])
-
-RTEMS_BSPOPTS_SET([INSTRUCTION_CACHE_ENABLE],[*],[1])
-RTEMS_BSPOPTS_HELP([INSTRUCTION_CACHE_ENABLE],
-[If defined, the instruction cache will be enabled after address translation
- is turned on.])
</font><font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
</font>
RTEMS_BSPOPTS_SET([BENCHMARK_IRQ_PROCESSING],[*],[0])
RTEMS_BSPOPTS_HELP([BENCHMARK_IRQ_PROCESSING],
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c:1.31 rtems/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c:1.32
--- rtems/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c:1.31 Fri Jan 28 14:29:51 2011
+++ rtems/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c Tue Jun 7 08:38:54 2011
</font><font color='#997700'>@@ -149,10 +149,10 @@
</font> /*
* Enable instruction and data caches. Do not force writethrough mode.
*/
<font color='#880000'>- #if INSTRUCTION_CACHE_ENABLE
</font><font color='#000088'>+ #if BSP_INSTRUCTION_CACHE_ENABLED
</font> rtems_cache_enable_instruction();
#endif
<font color='#880000'>- #if DATA_CACHE_ENABLE
</font><font color='#000088'>+ #if BSP_DATA_CACHE_ENABLED
</font> rtems_cache_enable_data();
#endif
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog:1.103 rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog:1.104
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog:1.103 Fri Feb 11 06:46:31 2011
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog Tue Jun 7 08:34:29 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * configure.ac, startup/bspstart.c: Use standard cache BSP options.
+
</font> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* startup/cpuinit.c:
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/configure.ac:1.17 rtems/c/src/lib/libbsp/powerpc/gen83xx/configure.ac:1.18
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/configure.ac:1.17 Thu Feb 10 06:56:55 2011
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/configure.ac Tue Jun 7 08:34:30 2011
</font><font color='#997700'>@@ -15,15 +15,11 @@
</font> RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
<font color='#880000'>-RTEMS_BSPOPTS_SET([DATA_CACHE_ENABLE],[*],[1])
-RTEMS_BSPOPTS_HELP([DATA_CACHE_ENABLE],
-[If defined, the data cache will be enabled after address translation
- is turned on.])
-
-RTEMS_BSPOPTS_SET([INSTRUCTION_CACHE_ENABLE],[*],[1])
-RTEMS_BSPOPTS_HELP([INSTRUCTION_CACHE_ENABLE],
-[If defined, the instruction cache will be enabled after address translation
- is turned on.])
</font><font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[1])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
</font>
RTEMS_BSPOPTS_SET([MPC8313ERDB],[mpc8313erdb],[1])
RTEMS_BSPOPTS_HELP([MPC8313ERDB],
<font color='#997700'>@@ -58,10 +54,6 @@
</font> RTEMS_BSPOPTS_SET([HAS_UBOOT],[mpc8313erdb],[1])
RTEMS_BSPOPTS_HELP([HAS_UBOOT],[If defined, enables U-Boot support.])
<font color='#880000'>-RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[1])
-RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE], [If defined, then the PowerPC specific
- code in RTEMS will use data cache instructions to optimize the context switch code.])
-
</font> RTEMS_BSPOPTS_SET([GEN83XX_ENABLE_INTERRUPT_NESTING],[*],[1])
RTEMS_BSPOPTS_HELP([GEN83XX_ENABLE_INTERRUPT_NESTING],[enable interrupt nesting])
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c:1.31 rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c:1.32
--- rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c:1.31 Mon Jan 24 09:32:04 2011
+++ rtems/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c Tue Jun 7 08:34:30 2011
</font><font color='#997700'>@@ -96,11 +96,11 @@
</font> * Enable instruction and data caches. Do not force writethrough mode.
*/
<font color='#880000'>-#if INSTRUCTION_CACHE_ENABLE
</font><font color='#000088'>+#if BSP_INSTRUCTION_CACHE_ENABLED
</font> rtems_cache_enable_instruction();
#endif
<font color='#880000'>-#if DATA_CACHE_ENABLE
</font><font color='#000088'>+#if BSP_DATA_CACHE_ENABLED
</font> rtems_cache_enable_data();
#endif
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog:1.155 rtems/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog:1.156
--- rtems/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog:1.155 Fri Feb 11 06:48:37 2011
+++ rtems/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog Tue Jun 7 08:28:01 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * configure.ac, startup/bspstart.c: Use standard cache BSP options.
+
</font> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* include/tm27.h, irq/irq.c:
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac:1.35 rtems/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac:1.36
--- rtems/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac:1.35 Wed Feb 2 09:00:08 2011
+++ rtems/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac Tue Jun 7 08:28:01 2011
</font><font color='#997700'>@@ -15,15 +15,11 @@
</font> RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
<font color='#880000'>-RTEMS_BSPOPTS_SET([DATA_CACHE_ENABLE],[*],[0])
-RTEMS_BSPOPTS_HELP([DATA_CACHE_ENABLE],
-[If defined, the data cache will be enabled after address translation
- is turned on.])
-
-RTEMS_BSPOPTS_SET([INSTRUCTION_CACHE_ENABLE],[*],[0])
-RTEMS_BSPOPTS_HELP([INSTRUCTION_CACHE_ENABLE],
-[If defined, the instruction cache will be enabled after address translation
- is turned on.])
</font><font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
</font>
RTEMS_BSPOPTS_SET([UARTS_USE_TERMIOS],[*],[0])
RTEMS_BSPOPTS_HELP([UARTS_USE_TERMIOS],
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c:1.26 rtems/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c:1.27
--- rtems/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c:1.26 Mon Aug 23 11:08:53 2010
+++ rtems/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c Tue Jun 7 08:28:01 2011
</font><font color='#997700'>@@ -197,10 +197,10 @@
</font> /*
* Enable instruction and data caches. Do not force writethrough mode.
*/
<font color='#880000'>-#if INSTRUCTION_CACHE_ENABLE
</font><font color='#000088'>+#if BSP_INSTRUCTION_CACHE_ENABLED
</font> rtems_cache_enable_instruction();
#endif
<font color='#880000'>-#if DATA_CACHE_ENABLE
</font><font color='#000088'>+#if BSP_DATA_CACHE_ENABLED
</font> rtems_cache_enable_data();
#endif
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog:1.187 rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog:1.188
--- rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog:1.187 Wed May 18 00:26:53 2011
+++ rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog Tue Jun 7 08:25:47 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * configure.ac, startup/bspstart.c: Use standard cache BSP options.
+
</font> 2011-05-17 Till Straumann <strauman@slac.stanford.edu>
PR1797/bsps
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac:1.38 rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac:1.39
--- rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac:1.38 Wed May 18 00:26:53 2011
+++ rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac Tue Jun 7 08:25:47 2011
</font><font color='#997700'>@@ -15,6 +15,12 @@
</font> RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
<font color='#000088'>+RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[])
+RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
+
+RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[])
+RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
+
</font> ## FIXME: This should be a 1 out of 3 selection
## and is somehow coupled to USE_DINK (cf. include/gen2.h)
RTEMS_BSPOPTS_SET([SCORE603E_USE_SDS],[*],[0])
<font color='#997700'>@@ -52,15 +58,6 @@
</font> response time. The use of these registers can conflict with
other tools like debuggers.])
<font color='#880000'>-RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[0])
-RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
-[If defined, then the PowerPC specific code in RTEMS will use
- data cache instructions to optimize the context switch code.
- This code can conflict with debuggers or emulators. It is known
- to break the Corelis PowerPC emulator with at least some combinations
- of PowerPC 603e revisions and emulator versions.
- The BSP actually contains the call that enables this.])
-
</font> RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
[If defined then the BSP may reduce the available memory size
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c:1.37 rtems/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c:1.38
--- rtems/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c:1.37 Fri Feb 11 06:47:19 2011
+++ rtems/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c Tue Jun 7 08:25:47 2011
</font><font color='#997700'>@@ -223,14 +223,14 @@
</font> #endif
bsp_clicks_per_usec = 66 / 4;
<font color='#880000'>- #if ( PPC_USE_DATA_CACHE )
</font><font color='#000088'>+ #if BSP_DATA_CACHE_ENABLED
</font> #if DEBUG
printk("bsp_start: cache_enable\n");
#endif
instruction_cache_enable ();
data_cache_enable ();
#if DEBUG
<font color='#880000'>- printk("bsp_start: END PPC_USE_DATA_CACHE\n");
</font><font color='#000088'>+ printk("bsp_start: END BSP_DATA_CACHE_ENABLED\n");
</font> #endif
#endif
</pre>
<p> </p>
<a name='cs5'></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-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
* new-exceptions/bspsupport/ppc_exc_alignment.c: New file.
* Makefile.am: Reflect change above.
* new-exceptions/bspsupport/vectors.h: Declare
ppc_exc_alignment_handler().
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/ChangeLog.diff?r1=text&tr1=1.386&r2=text&tr2=1.387&diff_format=h">M</a></td><td width='1%'>1.387</td><td width='100%'>c/src/lib/libcpu/powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/Makefile.am.diff?r1=text&tr1=1.63&r2=text&tr2=1.64&diff_format=h">M</a></td><td width='1%'>1.64</td><td width='100%'>c/src/lib/libcpu/powerpc/Makefile.am</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_alignment.c?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_alignment.c</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h.diff?r1=text&tr1=1.9&r2=text&tr2=1.10&diff_format=h">M</a></td><td width='1%'>1.10</td><td width='100%'>c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.386 rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.387
--- rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.386 Tue Jun 7 07:59:39 2011
+++ rtems/c/src/lib/libcpu/powerpc/ChangeLog Tue Jun 7 08:58:23 2011
</font><font color='#997700'>@@ -1,5 +1,12 @@
</font> 2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
<font color='#000088'>+ * new-exceptions/bspsupport/ppc_exc_alignment.c: New file.
+ * Makefile.am: Reflect change above.
+ * new-exceptions/bspsupport/vectors.h: Declare
+ ppc_exc_alignment_handler().
+
+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
</font> * new-exceptions/cpu_asm.S: Use BSP_DATA_CACHE_ENABLED instead of
PPC_USE_DATA_CACHE.
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/Makefile.am:1.63 rtems/c/src/lib/libcpu/powerpc/Makefile.am:1.64
--- rtems/c/src/lib/libcpu/powerpc/Makefile.am:1.63 Tue Jun 7 03:23:44 2011
+++ rtems/c/src/lib/libcpu/powerpc/Makefile.am Tue Jun 7 08:58:23 2011
</font><font color='#997700'>@@ -41,6 +41,7 @@
</font> new-exceptions/bspsupport/ppc_exc_global_handler.c \
new-exceptions/bspsupport/ppc_exc_categories.c \
new-exceptions/bspsupport/ppc_exc_address.c \
<font color='#000088'>+ new-exceptions/bspsupport/ppc_exc_alignment.c \
</font> new-exceptions/bspsupport/ppc_exc_prologue.c
new_exceptions_exc_bspsupport_rel_CPPFLAGS = $(AM_CPPFLAGS)
<font color='#006600'>diff -u /dev/null rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_alignment.c:1.1
--- /dev/null Tue Jun 7 09:10:15 2011
+++ rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_alignment.c Tue Jun 7 08:58:23 2011
</font><font color='#997700'>@@ -0,0 +1,45 @@
</font><font color='#000088'>+/*
+ * Copyright (c) 2011 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Obere Lagerstr. 30
+ * 82178 Puchheim
+ * Germany
+ * <rtems@embedded-brains.de>
+ *
+ * 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.
+ *
+ * $Id$
+ */
+
+#include <rtems.h>
+#include <bsp/vectors.h>
+
+int ppc_exc_alignment_handler(BSP_Exception_frame *frame, unsigned excNum)
+{
+ unsigned opcode = *(unsigned *) frame->EXC_SRR0;
+
+ /* Do we have a dcbz instruction? */
+ if ((opcode & 0xffe007ff) == 0x7c0007ec) {
+ unsigned clsz = (unsigned) rtems_cache_get_data_line_size();
+ unsigned a = (opcode >> 16) & 0x1f;
+ unsigned b = (opcode >> 11) & 0x1f;
+ unsigned *regs = &frame->GPR0;
+ unsigned *current = (unsigned *)
+ (((a == 0 ? 0 : regs [a]) + regs [b]) & (clsz - 1));
+ unsigned *end = current + clsz / 4;
+
+ while (current != end) {
+ *current = 0;
+ ++current;
+ }
+
+ frame->EXC_SRR0 += 4;
+
+ return 0;
+ } else {
+ return -1;
+ }
+}
</font>
<font color='#006600'>diff -u rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h:1.9 rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h:1.10
--- rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h:1.9 Thu Feb 17 05:19:43 2011
+++ rtems/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h Tue Jun 7 08:58:23 2011
</font><font color='#997700'>@@ -509,6 +509,14 @@
</font> void
ppc_exc_wrapup(BSP_Exception_frame *f);
<font color='#000088'>+/**
+ * @brief Standard aligment handler.
+ *
+ * @retval 0 Performed a dcbz instruction.
+ * @retval -1 Otherwise.
+ */
+int ppc_exc_alignment_handler(BSP_Exception_frame *frame, unsigned excNum);
+
</font> /** @} */
/*
</pre>
<p> </p>
<a name='cs6'></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-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/src/memcpy.c: New file.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ChangeLog.diff?r1=text&tr1=1.248&r2=text&tr2=1.249&diff_format=h">M</a></td><td width='1%'>1.249</td><td width='100%'>c/src/lib/libbsp/powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/shared/src/memcpy.c?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">c/src/lib/libbsp/powerpc/shared/src/memcpy.c</font></td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.248 rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.249
--- rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.248 Tue Jun 7 08:02:50 2011
+++ rtems/c/src/lib/libbsp/powerpc/ChangeLog Tue Jun 7 09:09:31 2011
</font><font color='#997700'>@@ -1,5 +1,9 @@
</font> 2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
<font color='#000088'>+ * shared/src/memcpy.c: New file.
+
+2011-06-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
</font> * shared/src/bsp-start-zero.S: Use BSP_DATA_CACHE_ENABLED instead of
DATA_CACHE_ENABLE.
<font color='#006600'>diff -u /dev/null rtems/c/src/lib/libbsp/powerpc/shared/src/memcpy.c:1.1
--- /dev/null Tue Jun 7 09:10:15 2011
+++ rtems/c/src/lib/libbsp/powerpc/shared/src/memcpy.c Tue Jun 7 09:09:31 2011
</font><font color='#997700'>@@ -0,0 +1,128 @@
</font><font color='#000088'>+/*
+ * Copyright (c) 2011 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Obere Lagerstr. 30
+ * 82178 Puchheim
+ * Germany
+ * <info@embedded-brains.de>
+ *
+ * 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.
+ *
+ * $Id$
+ */
+
+#include <bspopts.h>
+#include <rtems/powerpc/powerpc.h>
+
+#if BSP_DATA_CACHE_ENABLED && PPC_CACHE_ALIGNMENT == 32
+
+#include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <libcpu/powerpc-utility.h>
+
+#define CACHE_LINE_SIZE 32
+
+#define WORD_SIZE 4
+
+#define WORD_MASK (WORD_SIZE - 1)
+
+static bool aligned(const void *a, const void *b)
+{
+ return ((((uintptr_t) a) | ((uintptr_t) b)) & WORD_MASK) == 0;
+}
+
+void *memcpy(void *dst_ptr, const void *src_ptr, size_t n)
+{
+ uint8_t *dst = dst_ptr;
+ const uint8_t *src = src_ptr;
+
+ ppc_data_cache_block_touch(src);
+
+ if (__builtin_expect(n >= WORD_SIZE && aligned(src, dst), 1)) {
+ uint32_t *word_dst = (uint32_t *) dst - 1;
+ const uint32_t *word_src = (const uint32_t *) src - 1;
+
+ if (n >= 2 * CACHE_LINE_SIZE - WORD_SIZE) {
+ while ((uintptr_t) (word_dst + 1) % CACHE_LINE_SIZE != 0) {
+ uint32_t tmp;
+ __asm__ volatile (
+ "lwzu %[tmp], 0x4(%[src])\n"
+ "stwu %[tmp], 0x4(%[dst])\n"
+ : [src] "+b" (word_src),
+ [dst] "+b" (word_dst),
+ [tmp] "=&r" (tmp)
+ );
+ n -= WORD_SIZE;
+ }
+
+ while (n >= CACHE_LINE_SIZE) {
+ uint32_t dst_offset = 4;
+ uint32_t src_offset = 32 + 4;
+ uint32_t tmp0;
+ uint32_t tmp1;
+ uint32_t tmp2;
+ uint32_t tmp3;
+ __asm__ volatile (
+ "dcbz %[dst], %[dst_offset]\n"
+ "lwz %[tmp0], 0x04(%[src])\n"
+ "dcbt %[src], %[src_offset]\n"
+ "lwz %[tmp1], 0x08(%[src])\n"
+ "lwz %[tmp2], 0x0c(%[src])\n"
+ "lwz %[tmp3], 0x10(%[src])\n"
+ "stw %[tmp0], 0x04(%[dst])\n"
+ "stw %[tmp1], 0x08(%[dst])\n"
+ "stw %[tmp2], 0x0c(%[dst])\n"
+ "stw %[tmp3], 0x10(%[dst])\n"
+ "lwz %[tmp0], 0x14(%[src])\n"
+ "lwz %[tmp1], 0x18(%[src])\n"
+ "lwz %[tmp2], 0x1c(%[src])\n"
+ "lwzu %[tmp3], 0x20(%[src])\n"
+ "stw %[tmp0], 0x14(%[dst])\n"
+ "stw %[tmp1], 0x18(%[dst])\n"
+ "stw %[tmp2], 0x1c(%[dst])\n"
+ "stwu %[tmp3], 0x20(%[dst])\n"
+ : [src] "+b" (word_src),
+ [dst] "+b" (word_dst),
+ [tmp0] "=&r" (tmp0),
+ [tmp1] "=&r" (tmp1),
+ [tmp2] "=&r" (tmp2),
+ [tmp3] "=&r" (tmp3)
+ : [src_offset] "r" (src_offset),
+ [dst_offset] "r" (dst_offset)
+ );
+ n -= CACHE_LINE_SIZE;
+ }
+ }
+
+ while (n >= WORD_SIZE) {
+ uint32_t tmp;
+ __asm__ volatile (
+ "lwzu %[tmp], 0x4(%[src])\n"
+ "stwu %[tmp], 0x4(%[dst])\n"
+ : [src] "+b" (word_src),
+ [dst] "+b" (word_dst),
+ [tmp] "=&r" (tmp)
+ );
+ n -= WORD_SIZE;
+ }
+
+ dst = (uint8_t *) word_dst + 4;
+ src = (const uint8_t *) word_src + 4;
+ }
+
+ while (n > 0) {
+ *dst = *src;
+ ++src;
+ ++dst;
+ --n;
+ }
+
+ return dst_ptr;
+}
+
+#endif /* BSP_DATA_CACHE_ENABLED && PPC_CACHE_ALIGNMENT == 32 */
</font></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>