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/dmv177/Makefile.am         | 7 +++----
 c/src/lib/libbsp/powerpc/dmv177/bsp_specs           | 2 +-
 c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am   | 4 ++--
 c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am | 4 ++--
 c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am | 4 ++--
 c/src/lib/libbsp/powerpc/dmv177/include/bsp.h       | 9 +++++++++
 c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am   | 4 ++--
 c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am   | 4 ++--
 c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am   | 4 ++--
 c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am | 4 ++--
 c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c  | 8 +-------
 c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am   | 4 ++--
 c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am     | 4 ++--
 c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am  | 4 ++--
 14 files changed, 34 insertions(+), 32 deletions(-)

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

diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
index e8a7c6f744..622214a2e1 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
@@ -1,14 +1,13 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUBDIRS = include clock console startup start timer scv64 tod \
-    sonic wrapup
+SUBDIRS = include clock console startup start timer scv64 tod sonic wrapup
 
 include $(top_srcdir)/../../bsp.am
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/bsp_specs b/c/src/lib/libbsp/powerpc/dmv177/bsp_specs
index 491b059df3..b0fbfa982f 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/dmv177/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/dmv177/clock/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am
index f5f3fd8112..f921d0730a 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am
index 30616f4de0..ffa00c85d9 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
index 2302aeeecb..2497acacad 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
index d0c5574348..d16d6698b8 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
@@ -20,6 +20,15 @@
 extern "C" {
 #endif
 
+/*
+ *  confdefs.h overrides for this BSP:
+ *   - termios serial ports (defaults to 1)
+ *   - Interrupt stack space is not minimum if defined.
+ */
+
+#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 4
+#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/dmv177/scv64/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am
index 7a552ad128..7108307411 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am
index a91fafbf9e..f5bb79a8a3 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am
index 354f02440b..58abb62a6e 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am
index e0381c0f59..b48e9ec4db 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
index 0825b0e45c..e5190c75f7 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
@@ -112,12 +112,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
    */
@@ -130,7 +124,7 @@ void bsp_start( void )
   Cpu_table.clicks_per_usec   = 66666667 / 4000000 / 2;
 
   Cpu_table.do_zero_of_workspace = TRUE;
-  Cpu_table.interrupt_stack_size = (12 * 1024);
+  Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
 
   /*
    *  Enable whatever caching is desired
diff --git a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am
index 7f16dcc233..5c2b8edf56 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am
index 0887a9830b..6951625591 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
index 792d785bb5..6f4655620d 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-- 
cgit v1.2.3