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.

2 files changed, 2 insertions, 16 deletions

diff --git a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in
index 9f6b78a6d0..8042d83b24 100644
--- a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in
+++ b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in
@@ -11,8 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 PGM=${ARCH}/startup.rel
 
 # C source names, if any, go here -- minus the .c
-# C_PIECES=bspstart sbrk setvec except i386-stub
-C_PIECES=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/i386/i386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
index 2415d8daec..77bba61cf3 100644
--- a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
@@ -141,11 +141,7 @@ bsp_postdriver_hook(void)
 }
 
 
-int main(
-  int argc,
-  char **argv,
-  char **environp
-)
+void bsp_start( void )
 {
 
 #ifdef PRINTON   
@@ -155,11 +151,6 @@ int main(
   outbyte ('S');
 #endif
 
-  if ((argc > 0) && argv && argv[0])
-    rtems_progname = argv[0];
-  else
-    rtems_progname = "RTEMS";
-
   /*
    *  we do not use the pretasking_hook.
    */
@@ -222,8 +213,4 @@ int main(
     BSP_Configuration.maximum_extensions++;
 #endif
 
-  rtems_initialize_executive( &BSP_Configuration, &Cpu_table );
-  /* does not return */
-  /* no cleanup necessary for i386ex */
-  for (;;);  /* was return 0 to go to the debug monitor */
 }