diff options
36 files changed, 128 insertions, 135 deletions
diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog index 014154d730..3a7818aaef 100644 --- a/c/src/lib/libbsp/arm/csb336/ChangeLog +++ b/c/src/lib/libbsp/arm/csb336/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/arm/csb336/include/bsp.h b/c/src/lib/libbsp/arm/csb336/include/bsp.h index 78f0db3a63..b9770e0ecf 100644 --- a/c/src/lib/libbsp/arm/csb336/include/bsp.h +++ b/c/src/lib/libbsp/arm/csb336/include/bsp.h @@ -31,9 +31,6 @@ extern "C" { #define BSP_OSC_FREQ 16000000 /* 16 MHz oscillator */ #define BSP_XTAL_FREQ 32768 /* 32.768 KHz crystal */ -/* How many serial ports? */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 - int get_perclk1_freq(void); /* diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index d55f4cd773..b886b6acf5 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/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-06 Joel Sherrill <joel.sherrill@OARcorp.com> * clock/clockdrv.c: Tinker with clock on Skyeye. diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/c/src/lib/libbsp/arm/edb7312/include/bsp.h index 9137868ec1..f3076747bf 100644 --- a/c/src/lib/libbsp/arm/edb7312/include/bsp.h +++ b/c/src/lib/libbsp/arm/edb7312/include/bsp.h @@ -35,8 +35,6 @@ struct rtems_bsdnet_ifconfig; int cs8900_driver_attach (struct rtems_bsdnet_ifconfig *config, int attaching); -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 - /* * Network driver configuration */ diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog index 8e2c90abd0..c4f491f7a0 100644 --- a/c/src/lib/libbsp/arm/gba/ChangeLog +++ b/c/src/lib/libbsp/arm/gba/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/arm/gba/include/bsp.h b/c/src/lib/libbsp/arm/gba/include/bsp.h index f3f3efc6a5..16eb39821f 100644 --- a/c/src/lib/libbsp/arm/gba/include/bsp.h +++ b/c/src/lib/libbsp/arm/gba/include/bsp.h @@ -30,8 +30,6 @@ extern "C" { #include <rtems/console.h> #include <rtems/clockdrv.h> -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1 - /** Define operation count for Tests */ #define OPERATION_COUNT 10 diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog index b33a70c73b..85774ef01d 100644 --- a/c/src/lib/libbsp/arm/gp32/ChangeLog +++ b/c/src/lib/libbsp/arm/gp32/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/arm/gp32/include/bsp.h b/c/src/lib/libbsp/arm/gp32/include/bsp.h index d702591d5e..f9b7eb1793 100644 --- a/c/src/lib/libbsp/arm/gp32/include/bsp.h +++ b/c/src/lib/libbsp/arm/gp32/include/bsp.h @@ -57,9 +57,6 @@ void gp32_setPalette( unsigned char pos, uint16_t color); #define Tchr 0x2 /* 3 clk */ -/* How many serial ports? */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1 - /* * This BSP provides its own IDLE task to override the RTEMS one. * So we prototype it and define the constant confdefs.h expects diff --git a/c/src/lib/libbsp/arm/gumstix/ChangeLog b/c/src/lib/libbsp/arm/gumstix/ChangeLog index 5b1b4d4313..28c07dd804 100644 --- a/c/src/lib/libbsp/arm/gumstix/ChangeLog +++ b/c/src/lib/libbsp/arm/gumstix/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-21 Xi Yang <hiyangxi@gmail.com> * Makefile.am: Add fb/fb.c add rtl8019 Ethernet card support diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp.h b/c/src/lib/libbsp/arm/gumstix/include/bsp.h index 83af58ed78..5054bd4b24 100755 --- a/c/src/lib/libbsp/arm/gumstix/include/bsp.h +++ b/c/src/lib/libbsp/arm/gumstix/include/bsp.h @@ -33,9 +33,6 @@ extern "C" { console_tbl *BSP_get_uart_from_minor(int minor); static inline int32_t BSP_get_baud(void) {return 115200;} -/* How many serial ports? */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1 - /* How big should the interrupt stack be? */ #define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024) diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog index c9a27272a3..05197ee8b8 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog +++ b/c/src/lib/libbsp/arm/rtl22xx/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-09 Joel Sherrill <joel.sherrill@oarcorp.com> * configure.ac, startup/bspreset.c: Add Skyeye reset device. diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h index 63b3dea389..5ac412a8b3 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h +++ b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h @@ -129,8 +129,6 @@ struct rtems_bsdnet_ifconfig; int cs8900_driver_attach (struct rtems_bsdnet_ifconfig *config, int attaching); -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 - /* * Network driver configuration */ diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog b/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog index 8743a60542..ef641c1061 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog +++ b/c/src/lib/libbsp/bfin/bf537Stamp/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/bfin/bf537Stamp/include/bsp.h b/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h index df68929ca9..99f6785422 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h +++ b/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h @@ -66,13 +66,6 @@ extern "C" { #define FIFOLENGTH 0x100 /* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - */ - -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 - -/* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. */ diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 3b1f9b0f90..a986cb0d0a 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/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-06 Joel Sherrill <joel.sherrill@oarcorp.com> * include/tm27.h: Remove references to rtems_interrupt_catch since this diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h index 0df6e9067e..80fd33978f 100644 --- a/c/src/lib/libbsp/i386/pc386/include/bsp.h +++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h @@ -54,18 +54,11 @@ extern "C" { #include <libcpu/cpu.h> #include <rtems/bspIo.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports - * - Interrupt stack space is not minimum if defined. - */ - #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1 /* * Network driver configuration */ - struct rtems_bsdnet_ifconfig; extern int rtems_ne_driver_attach(struct rtems_bsdnet_ifconfig *, int); diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog index 246beee89c..559db429f4 100644 --- a/c/src/lib/libbsp/m68k/csb360/ChangeLog +++ b/c/src/lib/libbsp/m68k/csb360/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/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h index f71d3d2f68..dfc1470994 100644 --- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h @@ -118,14 +118,6 @@ extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config); #define RTEMS_BSP_NETWORK_DRIVER_NAME "eth0" #define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_enet_driver_attach -/* - * 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 - /* System frequency */ #define BSP_SYSTEM_FREQUENCY (66 * 1000 * 1000) diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index 903036ae34..a3ea648aa3 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/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/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h index 82faf2b5a3..f081e15fde 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h @@ -132,14 +132,6 @@ extern "C" { #include "i2c.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 - /* System frequency */ #define BSP_SYSTEM_FREQUENCY ((unsigned int)&_SYS_CLOCK_FREQUENCY) extern char _SYS_CLOCK_FREQUENCY; /* Don't use this variable directly!!! */ diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 0675eb1bc6..b99699a08a 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/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/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h index 8dabe4958d..7edcb95c5d 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h @@ -2,7 +2,7 @@ * * This include file contains all mrm board IO definitions. * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -32,14 +32,7 @@ extern "C" { #define BSP_SMALL_MEMORY 1 -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - #define CONSOLE_SCI -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ /* * Simple spin delay in microsecond units for device drivers. diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 6934215e3a..9e360922c9 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/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-13 Joel Sherrill <joel.sherrill@OARcorp.com> * console/console.c, timer/timer.c: Fix warnings and typos. diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h index c3d03d30ed..5dbd996843 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h @@ -5,7 +5,7 @@ * Computer Programmer's Reference Guide (MVME187PG/D2) with the April * 1993 supplements/addenda (MVME187PG/D2A1). * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -33,14 +33,6 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/bspIo.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 4 - #include <mvme16x_hw.h> /* GCSR is in mvme16x_hw.h */ 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 |