2009-08-21 Joel Sherrill <joel.sherrill@OARcorp.com>

	* include/bsp.h: Eliminate BSPs defining NUMBER_OF_TERMIOS_PORTS.
	Should be automatically handled by confdefs.h or the application.

12 files changed, 66 insertions, 73 deletions

diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
index f697c3e1aa..4467c99371 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-21	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* include/bsp.h: Eliminate BSPs defining NUMBER_OF_TERMIOS_PORTS.
+	Should be automatically handled by confdefs.h or the application.
+
 2009-07-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* configure.ac: Rename BSP_BOOTCARD_OPTIONS to
diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
index c0ed8f11ea..b51ed74a0f 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
@@ -20,15 +20,6 @@
 #include <rtems/clockdrv.h>
 #include <bsp/vectors.h>
 
-
-/*
- *  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 2
-
 /* fundamental addresses for BSP (CHRPxxx and PREPxxx are from libcpu/io.h) */
 #define	_IO_BASE	        CHRP_ISA_IO_BASE 
 #define _ISA_MEM_BASE           CHRP_ISA_MEM_BASE
diff --git a/c/src/lib/libbsp/powerpc/haleakala/ChangeLog b/c/src/lib/libbsp/powerpc/haleakala/ChangeLog
index 7afa6ee60d..8832456fff 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/haleakala/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-21	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* include/bsp.h: Eliminate BSPs defining NUMBER_OF_TERMIOS_PORTS.
+	Should be automatically handled by confdefs.h or the application.
+
 2009-07-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* configure.ac: Rename BSP_BOOTCARD_OPTIONS to
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h b/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h
index 784e21c696..558abc55e5 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h
@@ -6,7 +6,7 @@
  *
  * derived from helas403/include/bsp.h:
  *  Id: bsp.h,v 1.4 2001/06/18 17:01:48 joel Exp
- *  Author:	Thomas Doerfler <td@imd.m.isar.de>
+ *  Author:  Thomas Doerfler <td@imd.m.isar.de>
  *              IMD Ingenieurbuero fuer Microcomputertechnik
  *
  *  COPYRIGHT (c) 1998 by IMD
@@ -14,7 +14,7 @@
  *  Changes from IMD are covered by the original distributions terms.
  *  This file has been derived from the papyrus BSP.
  *
- *  Author:	Andrew Bray <andy@i-cubed.co.uk>
+ *  Author:  Andrew Bray <andy@i-cubed.co.uk>
  *
  *  COPYRIGHT (c) 1995 by i-cubed ltd.
  *
@@ -55,45 +55,43 @@ extern "C" {
 
 #ifdef ASM
 
-	/* Definition of where to store registers in alignment handler */
-	#define ALIGN_REGS 0x0140
 
-#else
-
-	#include <rtems.h>
-	#include <rtems/console.h>
-	#include <rtems/clockdrv.h>
-	#include <libcpu/io.h>
-	#include <rtems/console.h>
-	#include <rtems/iosupp.h>
-	#include <bsp/irq.h>
-	#include <bsp/vectors.h>
-
-	/* Network Defines */
-	#define RTEMS_BSP_NETWORK_DRIVER_NAME     "eth0"
-	
-	struct rtems_bsdnet_ifconfig;
-	int rtems_emac_driver_attach(struct rtems_bsdnet_ifconfig* config, int attaching);
-	#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_emac_driver_attach
-
-	/* Definitions for the shared console/UART driver */
-	#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2
+  /* Definition of where to store registers in alignment handler */
+  #define ALIGN_REGS 0x0140
 
-	#define BSP_UART_IOBASE_COM1	0xEF600200		/* PPC405EX */
-	#define BSP_UART_IOBASE_COM2	0xEF600300
-
-	#define BSP_CONSOLE_PORT		BSP_UART_COM1		/* console */
-
-	#define BSP_UART_BAUD_BASE		(11059200 / 16)		/* Kilauea ext clock, max speed */
-
-	/* functions */
+#else
 
-	rtems_isr_entry set_vector(                    /* returns old vector */
-	  rtems_isr_entry     handler,                  /* isr routine        */
-	  rtems_vector_number vector,                   /* vector number      */
-	  int                 type                      /* RTEMS or RAW intr  */
-	);
-	
+  #include <rtems.h>
+  #include <rtems/console.h>
+  #include <rtems/clockdrv.h>
+  #include <libcpu/io.h>
+  #include <rtems/console.h>
+  #include <rtems/iosupp.h>
+  #include <bsp/irq.h>
+  #include <bsp/vectors.h>
+
+  /* Network Defines */
+  #define RTEMS_BSP_NETWORK_DRIVER_NAME     "eth0"
+  
+  struct rtems_bsdnet_ifconfig;
+  int rtems_emac_driver_attach(struct rtems_bsdnet_ifconfig* config, int attaching);
+  #define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_emac_driver_attach
+
+  #define BSP_UART_IOBASE_COM1  0xEF600200    /* PPC405EX */
+  #define BSP_UART_IOBASE_COM2  0xEF600300
+
+  #define BSP_CONSOLE_PORT    BSP_UART_COM1    /* console */
+
+  #define BSP_UART_BAUD_BASE    (11059200 / 16)    /* Kilauea ext clock, max speed */
+
+  /* functions */
+
+  rtems_isr_entry set_vector(                    /* returns old vector */
+    rtems_isr_entry     handler,                  /* isr routine        */
+    rtems_vector_number vector,                   /* vector number      */
+    int                 type                      /* RTEMS or RAW intr  */
+  );
+  
 #endif /* ASM */
 
 #ifdef __cplusplus
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
index 2546f6193f..b24cb1df60 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-21	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* include/bsp.h: Eliminate BSPs defining NUMBER_OF_TERMIOS_PORTS.
+	Should be automatically handled by confdefs.h or the application.
+
 2009-07-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* configure.ac: Rename BSP_BOOTCARD_OPTIONS to
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
index 5368016cd7..0fca420bd3 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
@@ -22,17 +22,9 @@
 
 /*
  *  confdefs.h overrides for this BSP:
- *   - termios serial ports (defaults to 1)
- *   - Interrupt stack space is not minimum if defined.
  */
-
-#if !defined(mvme2100)
-#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2
-#endif
-
 #define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
 
-
 /*
  * diagram illustrating the role of the configuration
  * constants
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
index 725aab8c1a..7f33b0755a 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-21	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* include/bsp.h: Eliminate BSPs defining NUMBER_OF_TERMIOS_PORTS.
+	Should be automatically handled by confdefs.h or the application.
+
 2009-08-17	Till Straumann <strauman@slac.stanford.edu>
 
 	* network/tsec.c, network/if_tsec_pub.h:
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
index 4b7879f82c..115750fb0c 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
@@ -24,10 +24,7 @@
 
 /*
  *  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 2
 #define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
  
 #define BSP_INTERRUPT_STACK_SIZE          (16 * 1024)
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index d062b2fce6..f8f4c1fc8e 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-21	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* include/bsp.h: Eliminate BSPs defining NUMBER_OF_TERMIOS_PORTS.
+	Should be automatically handled by confdefs.h or the application.
+
 2009-07-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* configure.ac: Rename BSP_BOOTCARD_OPTIONS to
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
index 995cc11e82..d84d17487e 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
@@ -112,11 +112,8 @@ DiscoveryChipVersion BSP_getDiscoveryChipVersion();
 
 /*
  *  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 2
 #define BSP_INTERRUPT_STACK_SIZE  (16 * 1024) /* <skf> 2/09 wants it to be adjustable by BSP */
 
 #define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK   /* <skf> 4/09 see shared/startup/sbrk.c and rtems/confdefs.h */
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
index 7909bcee61..f686511f2e 100644
--- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-21	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* include/bsp.h: Eliminate BSPs defining NUMBER_OF_TERMIOS_PORTS.
+	Should be automatically handled by confdefs.h or the application.
+
 2009-08-07	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* console/console.c, startup/genpvec.c, startup/setvec.c: Disable call
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
index 3b088ea2b0..374001f876 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
@@ -28,18 +28,6 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <bsp/vectors.h>
 
-/*
- *  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
-
 #ifdef ASM
 /* Definition of where to store registers in alignment handler */
 #define ALIGN_REGS 0x0140