From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 c/src/lib/libbsp/powerpc/score603e/Makefile.am              |  4 ++--
 c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am      |  4 ++--
 c/src/lib/libbsp/powerpc/score603e/bsp_specs                |  2 +-
 c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am        |  4 ++--
 c/src/lib/libbsp/powerpc/score603e/console/Makefile.am      |  4 ++--
 .../powerpc/score603e/console/consolereserveresources.c     |  7 +------
 c/src/lib/libbsp/powerpc/score603e/include/Makefile.am      |  4 ++--
 c/src/lib/libbsp/powerpc/score603e/include/bsp.h            | 13 +++++++++++++
 c/src/lib/libbsp/powerpc/score603e/start/Makefile.am        |  4 ++--
 c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am      |  4 ++--
 c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c       |  8 +-------
 c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am        |  4 ++--
 c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am          |  4 ++--
 c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am      |  4 ++--
 c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am       |  4 ++--
 15 files changed, 38 insertions(+), 36 deletions(-)

(limited to 'c/src/lib/libbsp/powerpc/score603e')

diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am
index a907ce6b0f..6fd72e2f09 100644
--- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am
index 4cc465ced1..007befdff4 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/bsp_specs b/c/src/lib/libbsp/powerpc/score603e/bsp_specs
index 491b059df3..b0fbfa982f 100644
--- a/c/src/lib/libbsp/powerpc/score603e/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/score603e/bsp_specs
@@ -22,5 +22,5 @@
 %{!qrtems: %(old_endfile)} %{qrtems: ecrtn%O%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -T linkcmds%s -e _start -u __vectors}
+%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -e _start -u __vectors}
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am
index f5f3fd8112..f921d0730a 100644
--- a/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am
index d5046de240..861491254b 100644
--- a/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/console/consolereserveresources.c b/c/src/lib/libbsp/powerpc/score603e/console/consolereserveresources.c
index 440e44f941..7039d8c8fc 100644
--- a/c/src/lib/libbsp/powerpc/score603e/console/consolereserveresources.c
+++ b/c/src/lib/libbsp/powerpc/score603e/console/consolereserveresources.c
@@ -20,10 +20,5 @@
 
 #include "consolebsp.h"
 
-void console_reserve_resources(
-  rtems_configuration_table *configuration
-)
-{
-  rtems_termios_reserve_resources( configuration, NUM_Z85C30_PORTS );
-}
+int console_reserve_resources_removed;
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am
index 986b0fe056..8e3935008f 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
index 2888a1dc9a..f40ead300b 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
@@ -20,6 +20,19 @@
 extern "C" {
 #endif
 
+/*
+ *  confdefs.h overrides for this BSP:
+ *   - termios serial ports (defaults to 1)
+ *   - Interrupt stack space is not minimum if defined.
+ */
+
+#if (HAS_PMC_PSC8)
+#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS (4 + 4)
+#else
+#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS (4)
+#endif
+#define CONFIGURE_INTERRUPT_STACK_MEMORY  (12 * 1024)
+  
 #ifdef ASM
 /* Definition of where to store registers in alignment handler */
 #define ALIGN_REGS 0x0140
diff --git a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am
index 354f02440b..58abb62a6e 100644
--- a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am
index 32521bbf8f..35a35071f6 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
index 6575c7425a..4da15d89b6 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
@@ -275,12 +275,6 @@ void bsp_start( void )
 
   BSP_Configuration.work_space_start = work_space_start;
 
-  /*
-   *  Account for the console's resources
-   */
-
-  console_reserve_resources( &BSP_Configuration );
-
   /*
    *  initialize the CPU table for this BSP
    */
@@ -291,7 +285,7 @@ void bsp_start( void )
   Cpu_table.postdriver_hook = SCORE603e_bsp_postdriver_hook;
   Cpu_table.clicks_per_usec = 66 / 4;  /* XXX get from linkcmds */
   Cpu_table.do_zero_of_workspace = TRUE;
-  Cpu_table.interrupt_stack_size = (12 * 1024);
+  Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
   Cpu_table.idle_task_stack_size = (3 * STACK_MINIMUM_SIZE);
 
 #if ( PPC_USE_DATA_CACHE )
diff --git a/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am
index 7f16dcc233..5c2b8edf56 100644
--- a/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am
index f56d2670fa..6a99b886be 100644
--- a/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am
index edacb0973a..67266e13a2 100644
--- a/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am
index c877167f3f..75424fe399 100644
--- a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-- 
cgit v1.2.3