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/papyrus/Makefile.am            | 4 ++--
 c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.am    | 4 ++--
 c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.am | 4 ++--
 c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am    | 4 ++--
 c/src/lib/libbsp/powerpc/papyrus/include/bsp.h          | 9 +++++++++
 c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.am    | 4 ++--
 c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c     | 2 +-
 c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am     | 4 ++--
 8 files changed, 22 insertions(+), 13 deletions(-)

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

diff --git a/c/src/lib/libbsp/powerpc/papyrus/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/Makefile.am
index fe52252374..1e5c6460c5 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/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/papyrus/dlentry/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.am
index 70c08c79f7..0e7348c235 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.am
index 8ed973873f..a993f39735 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am
index 091727637a..2b8181354c 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h b/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h
index bc1ab09267..34c86acf6c 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h
@@ -36,6 +36,15 @@
 extern "C" {
 #endif
 
+/*
+ *  confdefs.h overrides for this BSP:
+ *   - number of termios serial ports (defaults to 1)
+ *   - Interrupt stack space is not minimum if defined.
+ */
+
+/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */
+#define CONFIGURE_INTERRUPT_STACK_MEMORY  (4 * 1024)
+
 #ifdef ASM
 /* Definition of where to store registers in alignment handler */
 #define ALIGN_REGS 0x0140
diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.am
index 887b0fa744..db765ee0cf 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
index a330497c1e..c5e15313bf 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
@@ -120,7 +120,7 @@ void bsp_start( void )
 
   Cpu_table.pretasking_hook = bsp_pretasking_hook;  /* init libc, etc. */
   Cpu_table.postdriver_hook = bsp_postdriver_hook;
-  Cpu_table.interrupt_stack_size = 4 * 1024;
+  Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
 
   Cpu_table.clicks_per_usec = 10;
   Cpu_table.serial_per_sec = 10000000;
diff --git a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am
index e007524688..b098954601 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-- 
cgit v1.2.3