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.

4 files changed, 7 insertions, 31 deletions

diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
index 814b948bb2..28359d2d3e 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
@@ -109,8 +109,6 @@ void bsp_cleanup( void );
 extern rtems_configuration_table BSP_Configuration;     /* owned by BSP */
 extern rtems_cpu_table           Cpu_table;             /* owned by BSP */
 
-extern rtems_unsigned32          bsp_isr_level;
-
 extern int cpu_number;         /* from 0; cpu number in a multi cpu system */
 
 #ifdef __cplusplus
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/start/start.s b/c/src/lib/libbsp/hppa1.1/simhppa/start/start.s
index 92fda897d9..86298f0304 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/start/start.s
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/start/start.s
@@ -20,7 +20,7 @@ _crt0_argv      .WORD    _progname, 0
 /*
  * stuff we need that is defined elsewhere.
  */
-	.IMPORT main, CODE
+	.IMPORT boot_card, CODE
 	.IMPORT _bss_start, DATA
 	.IMPORT _bss_end, DATA
 	.IMPORT environ, DATA
@@ -75,8 +75,8 @@ bssloop
 	ldi	1,%ret0
 
 /*
- * Call the "main" routine from the application to get it going.
- * We call it as main(1, argv, 0)
+ * Call the "boot_card" routine from the application to get it going.
+ * We call it as boot_card(1, argv, 0)
  */
 
         copy    %r0, %r24
@@ -84,7 +84,7 @@ bssloop
 	ldil 	L%_crt0_argv,%r25
         ldo 	R%_crt0_argv(%r25),%r25
 
-	bl	main,%r2
+	bl	boot_card,%r2
         ldo     1(%r0), %r26
 
         .PROCEND
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in
index a7a7ac9382..894abe0d42 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in
@@ -11,23 +11,15 @@ 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)
 
-CC_PIECES=rtems-ctor
-CC_FILES=$(CC_PIECES:%=%.cc)
-CC_O_FILES=$(CC_PIECES:%=${ARCH}/%.o)
-
 H_FILES=
 
 SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
-# We install the RTEMS constructor as a separate .o
-# so it can be easily place correctly by the compiler config file.
-INSTALLED_O_FILES=$(ARCH)/rtems-ctor.o
-
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
@@ -56,7 +48,6 @@ CLOBBER_ADDITIONS +=
 ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
-all:	${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM)
-	$(INSTALL_VARIANT) $(INSTALLED_O_FILES) ${PROJECT_RELEASE}/lib
+all:	${ARCH} $(SRCS) $(PGM)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c b/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c
index b4072c1b57..ecb7a69d48 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c
@@ -39,7 +39,6 @@ extern rtems_configuration_table  Configuration;
 
 rtems_configuration_table BSP_Configuration;
 rtems_cpu_table           Cpu_table;
-rtems_unsigned32          bsp_isr_level;
 
 int cpu_number;
 
@@ -284,9 +283,7 @@ bsp_postdriver_hook(void)
  *
  */
 
-
-void
-bsp_start(void)
+void bsp_start(void)
 {
     /*
      * Set cpu_number to accurately reflect our cpu number
@@ -426,14 +423,4 @@ bsp_start(void)
 
     if (CPU_HPPA_CLICKS_PER_TICK == 0)
         CPU_HPPA_CLICKS_PER_TICK = 0x4000;
-
-    /*
-     *  Start most of RTEMS
-     *  main() will start the rest
-     */
-
-    bsp_isr_level = rtems_initialize_executive_early(
-      &BSP_Configuration,
-      &Cpu_table
-    );
 }