summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/mvme136/startup
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-03-21 15:37:18 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-03-21 15:37:18 +0000
commite2a2ec6016c9bb3f3146c701bbe950af212c097c (patch)
tree065452e3ecb58b60fb720dcd378e620089d4b407 /c/src/lib/libbsp/m68k/mvme136/startup
parent2b4aec86fceb8d61a2b30a82a2a2464e8c600d98 (diff)
downloadrtems-e2a2ec6016c9bb3f3146c701bbe950af212c097c.tar.bz2
Switch to using a shared main() for all of the embedded BSPs
based on the GNU tools. This usually involved correcting the type of bsp_start(), bsp_cleanup(), adjusting the start code to call the right start routine (the shared boot_card()), and then removing code from bsp_start() which was performed in the new boot_card()/main() path.
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme136/startup')
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in2
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c19
2 files changed, 2 insertions, 19 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in
index 6937330b60..60cbb0ecc6 100644
--- a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in
@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
-C_PIECES=bspclean bspstart sbrk setvec
+C_PIECES=bspclean bspstart main sbrk setvec
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
index bade2e8174..6c923e6073 100644
--- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
@@ -141,21 +141,11 @@ bsp_postdriver_hook(void)
rtems_fatal_error_occurred( error_code | 'I' << 8 | 'O' );
}
-
-int main(
- int argc,
- char **argv,
- char **environp
-)
+void bsp_start( void )
{
m68k_isr_entry *monitors_vector_table;
int index;
- if ((argc > 0) && argv && argv[0])
- rtems_progname = argv[0];
- else
- rtems_progname = "RTEMS";
-
monitors_vector_table = (m68k_isr_entry *)0; /* 135Bug Vectors are at 0 */
m68k_set_vbr( monitors_vector_table );
@@ -229,11 +219,4 @@ int main(
*/
rtems_libio_config(&BSP_Configuration, BSP_LIBIO_MAX_FDS);
-
- rtems_initialize_executive( &BSP_Configuration, &Cpu_table );
- /* does not return */
-
- bsp_cleanup();
-
- return 0;
}