From d34d8692b674a3366e3cef11a33941e8160c338d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 4 Dec 2007 22:22:26 +0000 Subject: 2007-12-04 Joel Sherrill * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field from CPU Table to Configuration Table. Eliminate CPU Table from all ports. Delete references to CPU Table in all forms. --- c/src/lib/libbsp/m68k/csb360/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/csb360/include/bsp.h | 1 - c/src/lib/libbsp/m68k/csb360/startup/bspstart.c | 11 ----------- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/gen68302/include/bsp.h | 9 --------- c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c | 8 -------- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/gen68340/include/bsp.h | 9 --------- c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c | 7 ------- c/src/lib/libbsp/m68k/gen68360/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/gen68360/include/bsp.h | 9 --------- c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c | 2 -- c/src/lib/libbsp/m68k/idp/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/idp/include/bsp.h | 9 --------- c/src/lib/libbsp/m68k/idp/startup/bspstart.c | 8 -------- c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h | 1 - c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c | 7 ------- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/mrm332/include/bsp.h | 1 - c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c | 3 --- c/src/lib/libbsp/m68k/mvme136/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/mvme136/include/bsp.h | 9 --------- c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c | 9 --------- c/src/lib/libbsp/m68k/mvme147/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/mvme147/include/bsp.h | 9 --------- c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c | 9 --------- c/src/lib/libbsp/m68k/mvme147s/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/mvme147s/include/bsp.h | 9 --------- c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c | 16 +++++----------- c/src/lib/libbsp/m68k/mvme162/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/mvme162/include/bsp.h | 9 --------- c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c | 9 --------- c/src/lib/libbsp/m68k/mvme167/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/mvme167/include/bsp.h | 1 - c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c | 6 ------ c/src/lib/libbsp/m68k/ods68302/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/ods68302/include/bsp.h | 9 --------- c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c | 9 --------- 39 files changed, 83 insertions(+), 184 deletions(-) (limited to 'c/src/lib/libbsp/m68k') diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog index bb21bb3d4d..be5ea6e21e 100644 --- a/c/src/lib/libbsp/m68k/csb360/ChangeLog +++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h index 77f49110eb..3dd7adf417 100644 --- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h @@ -125,7 +125,6 @@ extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config); */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) /* System frequency */ #define BSP_SYSTEM_FREQUENCY (66 * 1000 * 1000) diff --git a/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c b/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c index 8bfdb32265..36dfd25723 100644 --- a/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c @@ -40,17 +40,12 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - extern unsigned int _RamSize; - - char *rtems_progname; /* * Use the shared implementations of the following routines */ - void bsp_postdriver_hook(void); void bsp_libc_init( void *, uint32_t, int ); void bsp_pretasking_hook(void); /* m68k version */ @@ -64,7 +59,6 @@ void bsp_start( void ) extern unsigned long _M68k_Ramsize; _M68k_Ramsize = (unsigned long)&_RamSize; /* size set in linker script */ - /* * Need to "allocate" the memory for the RTEMS Workspace and * tell the RTEMS configuration where it is. This memory is @@ -72,9 +66,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; - - /* - * initialize the CPU table for this BSP - */ - Cpu_table.interrupt_stack_size = 4096; } diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 528dceffe7..bd3cab3bbb 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h index 11d966e24e..10f69dcc66 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h @@ -28,15 +28,6 @@ extern "C" { #include #include -/* - * 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) - /* * 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/m68k/gen68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c index d83e91c34b..543595fc5e 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c @@ -28,8 +28,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -71,10 +69,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; - - /* - * initialize the CPU table for this BSP - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; } diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 6c16e44e85..f749815873 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h index a451f0ca93..15afbfa4b3 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h @@ -31,15 +31,6 @@ extern "C" { #include #include -/* - * 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_INTERRUPT_STACK_MEMORY (4 * 1024) - /* * 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/m68k/gen68340/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c index c6b064b44f..4bb4ed4a7a 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c @@ -33,8 +33,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - char *rtems_progname; /* Initialize whatever libc we are using @@ -74,9 +72,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; - - /* - * initialize the CPU table for this BSP - */ - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; } diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index 74788dd560..fec20de52c 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index 6d8fa567d5..9486831ac2 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -37,15 +37,6 @@ extern "C" { #include #include -/* - * 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_INTERRUPT_STACK_MEMORY (4 * 1024) - /* * Network driver configuration */ diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c index 9b0cbfcd9b..3b505cf999 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c @@ -27,8 +27,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - char *rtems_progname; /* Amount of RAM on this board. Dynamically set in start.S */ diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index 1a2b43401f..8e13047923 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/idp/include/bsp.h b/c/src/lib/libbsp/m68k/idp/include/bsp.h index 7ae6d7f199..6b0917f6d8 100644 --- a/c/src/lib/libbsp/m68k/idp/include/bsp.h +++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h @@ -16,15 +16,6 @@ #include #include -/* - * 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) - #define DUART_ADDR 0xb00003 /* base address of the MC68681 DUART */ /* Constants */ diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c index ee740c4c17..c3d9431856 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c @@ -35,8 +35,6 @@ void led_putnum(); extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -91,12 +89,6 @@ void bsp_start( void ) rtems_cache_enable_instruction(); rtems_cache_enable_data(); - /* - * we only use a hook to get the C library initialized. - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; /* led_putnum('e'); * for debugging purposes only */ diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index 0142466a22..aa212143ed 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h index a5d48835ce..8c8605c679 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h @@ -145,7 +145,6 @@ extern "C" { */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) /* System frequency */ #define BSP_SYSTEM_FREQUENCY ((unsigned int)&_SYS_CLOCK_FREQUENCY) diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c index 2a14dd64c4..ba1a4239f4 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c @@ -40,8 +40,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - unsigned long _RamSize; char *rtems_progname; @@ -68,9 +66,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; - - /* - * initialize the CPU table for this BSP - */ - Cpu_table.interrupt_stack_size = 4096; } diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 729730ce06..bc76a38ab4 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * startup/bspstart.c: Moved most of the remaining CPU Table fields to diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h index e204740a19..0ac7b2dc0f 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h @@ -38,7 +38,6 @@ extern "C" { #define CONSOLE_SCI /* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -/* #define CONFIGURE_INTERRUPT_STACK_MEMORY (TBD * 1024) */ /* * Simple spin delay in microsecond units for device drivers. diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c b/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c index 5e42d9db5a..b98009bd63 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c @@ -26,9 +26,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index bc29522a47..2d7e6784ea 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index c0a89d16fd..efa813d8c6 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -26,15 +26,6 @@ extern "C" { #include #include -/* - * 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) - /* * 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/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c index 756c8b5bba..60878303d3 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c @@ -28,9 +28,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -74,11 +71,5 @@ void bsp_start( void ) rtems_cache_enable_instruction(); - /* - * we only use a hook to get the C library initialized. - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index ef962a1953..f51b882e7a 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * startup/bspstart.c: Moved most of the remaining CPU Table fields to diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h index 1d15e16094..ce1fd8f410 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h @@ -30,15 +30,6 @@ extern "C" { #include #include -/* - * 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) - /* Constants */ #define RAM_START 0x00005000 diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c index 09d0258728..0606257937 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c @@ -31,9 +31,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -82,11 +79,5 @@ void bsp_start( void ) rtems_cache_enable_instruction(); rtems_cache_enable_data(); - /* - * we only use a hook to get the C library initialized. - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index b99bc8aa6c..474707ace2 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h index 4b707195a5..94b6d374d7 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h @@ -30,15 +30,6 @@ extern "C" { #include #include -/* - * 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) - /* Constants */ #define RAM_START 0x00007000 diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c index b2336c260a..6b1736b720 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c @@ -31,9 +31,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -93,9 +90,12 @@ void bsp_start( void ) /* Make VME access round-robin */ } - node_number = - (uint8_t) +#if defined(RTEMS_MULTIPROCESSING) + node_number = (uint8_t) (Configuration.User_multiprocessing_table->node - 1) & 0xF; +#else + node_number = 1; +#endif /* Get and store node ID, first node_number = 0 */ vme_gcsr->board_identification = node_number; @@ -140,11 +140,5 @@ void bsp_start( void ) rtems_cache_enable_instruction(); rtems_cache_enable_data(); - /* - * we only use a hook to get the C library initialized. - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index 401dec1f58..fa2dd8c312 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h index 3dc38b4507..ce808b6b1b 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h @@ -33,15 +33,6 @@ extern "C" { #include #include -/* - * 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) - #include /*----------------------------------------------------------------*/ diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c index d625226f02..2ca2c25541 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c @@ -35,9 +35,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -98,11 +95,5 @@ void bsp_start( void ) page_table_init(); - /* - * we only use a hook to get the C library initialized. - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 12f70edc1f..3b7726d08c 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h index d4cae9fc0b..6e775ca2da 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h @@ -40,7 +40,6 @@ extern "C" { */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 4 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) #include diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c index 7cb49c090f..fa2034e4cf 100644 --- a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c @@ -35,9 +35,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; rtems_extensions_table user_extension_table; - -rtems_cpu_table Cpu_table; - /* * Use the shared implementations of the following routines. * Look in rtems/c/src/lib/libbsp/shared/bsppost.c and @@ -125,9 +122,6 @@ void bsp_start( void ) */ page_table_init( &Configuration ); - /* Must match value in start.s */ - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - /* * If the application has not overriden the default User_extension_table, * supply one with our own fatal error handler that returns control to diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index 600b8eee3a..e7b0f50c28 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h index 076d625405..571e4b3834 100644 --- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h @@ -29,15 +29,6 @@ extern "C" { #include #include -/* - * 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) - #ifndef VARIANT #define VARIANT bare #endif diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c index e801783fa3..e2548547af 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c @@ -27,10 +27,7 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; rtems_interrupt_level bsp_isr_level; - char *rtems_progname; /* @@ -62,10 +59,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; - - /* - * initialize the CPU table for this BSP - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; } -- cgit v1.2.3