2000-09-25 Joel Sherrill <joel@OARcorp.com>

	* rtems/score/a29k.h, rtems/score/cpu.h: Switched to using
	cpuopts.h not targopts.h to reduce dependency on BSP.

6 files changed, 36 insertions, 10 deletions

diff --git a/c/src/exec/score/cpu/a29k/ChangeLog b/c/src/exec/score/cpu/a29k/ChangeLog
index 65cef217bd..54d9a6085c 100644
--- a/c/src/exec/score/cpu/a29k/ChangeLog
+++ b/c/src/exec/score/cpu/a29k/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-25	Joel Sherrill <joel@OARcorp.com>
+
+	* rtems/score/a29k.h, rtems/score/cpu.h: Switched to using
+	cpuopts.h not targopts.h to reduce dependency on BSP.
+
 2000-09-22	Joel Sherrill <joel@OARcorp.com>
 
 	* amd.ah, cpu.c, cpu_asm.S, register.ah, sig.S, rtems/score/cpu.h:
diff --git a/c/src/exec/score/cpu/a29k/rtems/score/a29k.h b/c/src/exec/score/cpu/a29k/rtems/score/a29k.h
index e1e359d075..99a2626202 100644
--- a/c/src/exec/score/cpu/a29k/rtems/score/a29k.h
+++ b/c/src/exec/score/cpu/a29k/rtems/score/a29k.h
@@ -28,6 +28,15 @@ extern "C" {
  *  of the family.
  */
  
+#define A29K_HAS_FPU     0
+#define CPU_MODEL_NAME "a29xxx"
+
+/*
+ *  Moving toward multilib with no attempt to distinguish 
+ *  multilib features in gcc.
+ */
+
+#if 0
 #if defined(rtems_multilib)
 /*
  *  Figure out all CPU Model Feature Flags based upon compiler 
@@ -47,6 +56,7 @@ extern "C" {
 #error "Unsupported CPU Model"
  
 #endif
+#endif
 
 /*
  *  Define the name of the CPU family.
diff --git a/c/src/exec/score/cpu/a29k/rtems/score/cpu.h b/c/src/exec/score/cpu/a29k/rtems/score/cpu.h
index 2f0290c46e..75b558cb6f 100644
--- a/c/src/exec/score/cpu/a29k/rtems/score/cpu.h
+++ b/c/src/exec/score/cpu/a29k/rtems/score/cpu.h
@@ -529,13 +529,11 @@ SCORE_EXTERN void           (*_CPU_Thread_dispatch_pointer)();
 #define CPU_CONTEXT_FP_SIZE sizeof( Context_Control_fp )
 
 /*
- *  Amount of extra stack (above minimum stack size) required by
- *  system initialization thread.  Remember that in a multiprocessor
- *  system the system intialization thread becomes the MP server thread.
+ *  extra stack required by the MPCI receive server thread
  */
 
-#define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK 0
-
+#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 1024
+ 
 /*
  *  This defines the number of entries in the ISR_Vector_table managed
  *  by RTEMS.
diff --git a/cpukit/score/cpu/a29k/ChangeLog b/cpukit/score/cpu/a29k/ChangeLog
index 65cef217bd..54d9a6085c 100644
--- a/cpukit/score/cpu/a29k/ChangeLog
+++ b/cpukit/score/cpu/a29k/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-25	Joel Sherrill <joel@OARcorp.com>
+
+	* rtems/score/a29k.h, rtems/score/cpu.h: Switched to using
+	cpuopts.h not targopts.h to reduce dependency on BSP.
+
 2000-09-22	Joel Sherrill <joel@OARcorp.com>
 
 	* amd.ah, cpu.c, cpu_asm.S, register.ah, sig.S, rtems/score/cpu.h:
diff --git a/cpukit/score/cpu/a29k/rtems/score/a29k.h b/cpukit/score/cpu/a29k/rtems/score/a29k.h
index e1e359d075..99a2626202 100644
--- a/cpukit/score/cpu/a29k/rtems/score/a29k.h
+++ b/cpukit/score/cpu/a29k/rtems/score/a29k.h
@@ -28,6 +28,15 @@ extern "C" {
  *  of the family.
  */
  
+#define A29K_HAS_FPU     0
+#define CPU_MODEL_NAME "a29xxx"
+
+/*
+ *  Moving toward multilib with no attempt to distinguish 
+ *  multilib features in gcc.
+ */
+
+#if 0
 #if defined(rtems_multilib)
 /*
  *  Figure out all CPU Model Feature Flags based upon compiler 
@@ -47,6 +56,7 @@ extern "C" {
 #error "Unsupported CPU Model"
  
 #endif
+#endif
 
 /*
  *  Define the name of the CPU family.
diff --git a/cpukit/score/cpu/a29k/rtems/score/cpu.h b/cpukit/score/cpu/a29k/rtems/score/cpu.h
index 2f0290c46e..75b558cb6f 100644
--- a/cpukit/score/cpu/a29k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/a29k/rtems/score/cpu.h
@@ -529,13 +529,11 @@ SCORE_EXTERN void           (*_CPU_Thread_dispatch_pointer)();
 #define CPU_CONTEXT_FP_SIZE sizeof( Context_Control_fp )
 
 /*
- *  Amount of extra stack (above minimum stack size) required by
- *  system initialization thread.  Remember that in a multiprocessor
- *  system the system intialization thread becomes the MP server thread.
+ *  extra stack required by the MPCI receive server thread
  */
 
-#define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK 0
-
+#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 1024
+ 
 /*
  *  This defines the number of entries in the ISR_Vector_table managed
  *  by RTEMS.