2005-02-17 Ralf Corsepius <ralf.corsepius@rtems.org>

	* startup/bspstart.c: include <rtems/powerpc/powerpc.h>.
	Use PPC_MINIMUM_STACK_FRAME_SIZE instead of
	CPU_MINIMUM_STACK_FRAME_SIZE.

12 files changed, 53 insertions, 10 deletions

diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index e5bb372ca6..dc28da9f70 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-17	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* startup/bspstart.c: include <rtems/powerpc/powerpc.h>.
+	Use PPC_MINIMUM_STACK_FRAME_SIZE instead of
+	CPU_MINIMUM_STACK_FRAME_SIZE.
+
 2005-02-16	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Remove argument from RTEMS_PPC_EXCEPTIONS.
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c
index e62cd0715b..e6e94a44cf 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c
@@ -27,6 +27,7 @@
 #include <rtems/bspIo.h>
 #include <libcpu/cpuIdent.h>
 #include <libcpu/spr.h>
+#include <rtems/powerpc/powerpc.h>
 
 SPR_RW(SPRG0)
 SPR_RW(SPRG1)
@@ -167,7 +168,7 @@ void bsp_start(void)
    * Initialize some SPRG registers related to irq handling
    */
 
-  intrStack = (((unsigned char*)&intrStackPtr) - CPU_MINIMUM_STACK_FRAME_SIZE);
+  intrStack = (((unsigned char*)&intrStackPtr) - PPC_MINIMUM_STACK_FRAME_SIZE);
   _write_SPRG1((unsigned int)intrStack);
   /* signal them that we have fixed PR288 - eventually, this should go away */
   _write_SPRG0(PPC_BSP_HAS_FIXED_PR288);
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
index 4664775042..ca4168dcc1 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-17	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* startup/bspstart.c: include <rtems/powerpc/powerpc.h>.
+	Use PPC_MINIMUM_STACK_FRAME_SIZE instead of
+	CPU_MINIMUM_STACK_FRAME_SIZE.
+
 2005-02-16	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Remove argument from RTEMS_PPC_EXCEPTIONS.
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
index da23286b58..5c13389f50 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
@@ -45,6 +45,8 @@
 #include <rtems/libio.h>
 #include <rtems/libcsupport.h>
 #include <rtems/score/thread.h>
+#include <rtems/powerpc/powerpc.h>
+
 #include <rtems/bspIo.h>
 #include <libcpu/cpuIdent.h>
 #include <libcpu/spr.h>
@@ -234,7 +236,7 @@ void bsp_start(void)
    * Initialize some SPRG registers related to irq handling
    */
 
-  intrStack = (((unsigned char*)&intrStackPtr) - CPU_MINIMUM_STACK_FRAME_SIZE);
+  intrStack = (((unsigned char*)&intrStackPtr) - PPC_MINIMUM_STACK_FRAME_SIZE);
   _write_SPRG1((unsigned int)intrStack);
   /* signal that we have fixed PR288 - eventually, this should go away */
   _write_SPRG0(PPC_BSP_HAS_FIXED_PR288);
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index acbe69d456..9d912db73d 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,5 +1,11 @@
 2005-02-17	Ralf Corsepius <ralf.corsepius@rtems.org>
 
+	* startup/bspstart.c: include <rtems/powerpc/powerpc.h>.
+	Use PPC_MINIMUM_STACK_FRAME_SIZE instead of
+	CPU_MINIMUM_STACK_FRAME_SIZE.
+
+2005-02-17	Ralf Corsepius <ralf.corsepius@rtems.org>
+
 	* start/start.S: include <rtems/powerpc/powerpc.h>.
 	Use PPC_MINIMUM_STACK_FRAME_SIZE instead of
 	CPU_MINIMUM_STACK_FRAME_SIZE.
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
index aa402365e6..ae2793ac85 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
@@ -32,7 +32,8 @@
 #include <rtems/system.h>
 #include <rtems/libio.h>
 #include <rtems/libcsupport.h>
-/*#include <bsp/consoleIo.h>*/
+#include <rtems/powerpc/powerpc.h>
+
 #include <libcpu/spr.h>   /* registers.h is included here */
 #include <bsp.h>
 #include <bsp/uart.h>
@@ -43,7 +44,6 @@
 #include <bsp/vectors.h>
 #include <bsp/bspException.h>
 
-/* for RTEMS_VERSION :-( I dont like the preassembled string */
 #include <rtems/sptables.h>
 
 #ifdef __RTEMS_APPLICATION__
@@ -371,7 +371,7 @@ void bsp_start( void )
    * so there is no need to set it in r1 again... It is just for info
    * so that it can be printed without accessing R1.
    */
-  stack = ((unsigned char*) __rtems_end) + INIT_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
+  stack = ((unsigned char*) __rtems_end) + INIT_STACK_SIZE - PPC_MINIMUM_STACK_FRAME_SIZE;
 
  /* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */
   *((uint32_t *)stack) = 0;
@@ -390,7 +390,7 @@ void bsp_start( void )
    * some settings below...
    */
   intrStack = ((uint32_t) __rtems_end) + 
-          INIT_STACK_SIZE + INTR_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
+          INIT_STACK_SIZE + INTR_STACK_SIZE - PPC_MINIMUM_STACK_FRAME_SIZE;
 
   /* make sure it's properly aligned */
   intrStack &= ~(CPU_STACK_ALIGNMENT-1);
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog
index d0d804b97f..0189b4764d 100644
--- a/c/src/lib/libbsp/powerpc/psim/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-17	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* startup/bspstart.c: include <rtems/powerpc/powerpc.h>.
+	Use PPC_MINIMUM_STACK_FRAME_SIZE instead of
+	CPU_MINIMUM_STACK_FRAME_SIZE.
+
 2005-02-16	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Remove argument from RTEMS_PPC_EXCEPTIONS.
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
index 582b116ca9..ab3db1c56c 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
@@ -21,6 +21,8 @@
 #include <rtems/libio.h>
 #include <rtems/libcsupport.h>
 #include <rtems/bspIo.h>
+#include <rtems/powerpc/powerpc.h>
+
 #include <libcpu/cpuIdent.h>
 #include <libcpu/spr.h>
 
@@ -193,7 +195,7 @@ void bsp_start( void )
    * some settings below...
    */
   intrStack = ((uint32_t) __rtems_end) + 
-          INIT_STACK_SIZE + INTR_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
+          INIT_STACK_SIZE + INTR_STACK_SIZE - PPC_MINIMUM_STACK_FRAME_SIZE;
 
   /* make sure it's properly aligned */
   intrStack &= ~(CPU_STACK_ALIGNMENT-1);
diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog
index 5ce4582415..e41513fbc9 100644
--- a/c/src/lib/libbsp/powerpc/shared/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog
@@ -1,5 +1,11 @@
 2005-02-17	Ralf Corsepius <ralf.corsepius@rtems.org>
 
+	* startup/bspstart.c: include <rtems/powerpc/powerpc.h>.
+	Use PPC_MINIMUM_STACK_FRAME_SIZE instead of
+	CPU_MINIMUM_STACK_FRAME_SIZE.
+
+2005-02-17	Ralf Corsepius <ralf.corsepius@rtems.org>
+
 	* start/start.S: include <rtems/powerpc/powerpc.h>.
 	Use PPC_MINIMUM_STACK_FRAME_SIZE instead of
 	CPU_MINIMUM_STACK_FRAME_SIZE.
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
index a28a2c4e35..98aaf11bc7 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
@@ -34,6 +34,7 @@
 #include <libcpu/cpuIdent.h>
 #include <bsp/vectors.h>
 #include <bsp/motorola.h>
+#include <rtems/powerpc/powerpc.h>
 
 extern void _return_to_ppcbug();
 extern unsigned long __rtems_end[];
@@ -296,7 +297,7 @@ void bsp_start( void )
    * so that It can be printed without accessing R1.
    */
   stack = ((unsigned char*) __rtems_end) +
-               INIT_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
+               INIT_STACK_SIZE - PPC_MINIMUM_STACK_FRAME_SIZE;
 
   /* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */
   *((uint32_t*)stack) = 0;
@@ -309,7 +310,7 @@ void bsp_start( void )
    * some settings below...
    */
   intrStack = ((uint32_t) __rtems_end) + 
-          INIT_STACK_SIZE + INTR_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
+          INIT_STACK_SIZE + INTR_STACK_SIZE - PPC_MINIMUM_STACK_FRAME_SIZE;
 
   /* make sure it's properly aligned */
   intrStack &= ~(CPU_STACK_ALIGNMENT-1);
diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog
index 9c8d4f9ccf..39c9f36f51 100644
--- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ss555/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-17	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* startup/bspstart.c: include <rtems/powerpc/powerpc.h>.
+	Use PPC_MINIMUM_STACK_FRAME_SIZE instead of
+	CPU_MINIMUM_STACK_FRAME_SIZE.
+
 2005-02-16	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Remove argument from RTEMS_PPC_EXCEPTIONS.
diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c
index 81920142ca..fa644edabb 100644
--- a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c
@@ -28,6 +28,7 @@
 #include <rtems/libio.h>
 #include <rtems/libcsupport.h>
 #include <rtems/bspIo.h>
+#include <rtems/powerpc/powerpc.h>
 
 #include <libcpu/cpuIdent.h>
 #include <libcpu/spr.h>
@@ -155,7 +156,7 @@ void bsp_start(void)
   /*
    * Initialize some SPRG registers related to irq handling
    */
-  intrStack = (((unsigned char*)&intrStackPtr) - CPU_MINIMUM_STACK_FRAME_SIZE);
+  intrStack = (((unsigned char*)&intrStackPtr) - PPC_MINIMUM_STACK_FRAME_SIZE);
   _write_SPRG1((unsigned int)intrStack);
   /* signal them that we have fixed PR288 - eventually, this should go away */
   _write_SPRG0(PPC_BSP_HAS_FIXED_PR288);