diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-03-21 15:37:18 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-03-21 15:37:18 +0000 |
| commit | e2a2ec6016c9bb3f3146c701bbe950af212c097c (patch) | |
| tree | 065452e3ecb58b60fb720dcd378e620089d4b407 /c/src/lib/libbsp/m68k/ods68302 | |
| parent | Fixed spacing to be consistent with other CPUs. (diff) | |
| download | rtems-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/ods68302')
5 files changed, 8 insertions, 38 deletions
diff --git a/c/src/lib/libbsp/m68k/ods68302/start/cpuboot.c b/c/src/lib/libbsp/m68k/ods68302/start/cpuboot.c index 1a8f9bd2cf..fd8a4146de 100644 --- a/c/src/lib/libbsp/m68k/ods68302/start/cpuboot.c +++ b/c/src/lib/libbsp/m68k/ods68302/start/cpuboot.c @@ -110,7 +110,7 @@ void boot_phase_2(void) static constructors have not been called, and RTEMS is not initialised. */ -void boot_bsp(); +void boot_card(); void set_debug_traps(); void breakpoint(); @@ -127,7 +127,7 @@ void boot_phase_3(void) /* FIXME : add RAM and ROM checks */ /* boot the bsp, what ever this means */ - boot_bsp(); + boot_card(); WATCHDOG_TRIGGER(); } diff --git a/c/src/lib/libbsp/m68k/ods68302/start302/cpuboot.c b/c/src/lib/libbsp/m68k/ods68302/start302/cpuboot.c index 1a8f9bd2cf..fd8a4146de 100644 --- a/c/src/lib/libbsp/m68k/ods68302/start302/cpuboot.c +++ b/c/src/lib/libbsp/m68k/ods68302/start302/cpuboot.c @@ -110,7 +110,7 @@ void boot_phase_2(void) static constructors have not been called, and RTEMS is not initialised. */ -void boot_bsp(); +void boot_card(); void set_debug_traps(); void breakpoint(); @@ -127,7 +127,7 @@ void boot_phase_3(void) /* FIXME : add RAM and ROM checks */ /* boot the bsp, what ever this means */ - boot_bsp(); + boot_card(); WATCHDOG_TRIGGER(); } diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in index 95f0c8b323..4e4b8bcc32 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/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=crc debugport gdb-hooks m68302scc m68k-stub memcheck trace \ +C_PIECES=crc debugport gdb-hooks main m68302scc m68k-stub memcheck trace \ bspstart bspclean sbrk setvec C_FILES=$(C_PIECES:%=%.c) C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c index 03e5918aa8..09b8494e05 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c @@ -148,7 +148,7 @@ bsp_postdriver_hook(void) rtems_fatal_error_occurred( error_code | 'I' << 8 | 'O' ); } -void bsp_start() +void bsp_start( void ) { /* * Allocate the memory for the RTEMS Work Space. This can come from @@ -230,34 +230,4 @@ void bsp_start() /* * Don't forget the other CPU Table entries. */ - - /* - * Start RTEMS - */ - - bsp_isr_level = rtems_initialize_executive_early( &BSP_Configuration, &Cpu_table ); } - -int main(int argc, char **argv, char **environ) -{ - if ((argc > 0) && argv && argv[0]) - rtems_progname = argv[0]; - else - rtems_progname = "RTEMS"; - - rtems_initialize_executive_late( bsp_isr_level ); - - bsp_cleanup(); - - return 0; -} - -void boot_bsp() -{ - /* the atexit hook will be before the static destructor list's entry - point */ - bsp_start(); - - exit(main(0, 0, 0)); -} - diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c b/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c index 1a8f9bd2cf..fd8a4146de 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c @@ -110,7 +110,7 @@ void boot_phase_2(void) static constructors have not been called, and RTEMS is not initialised. */ -void boot_bsp(); +void boot_card(); void set_debug_traps(); void breakpoint(); @@ -127,7 +127,7 @@ void boot_phase_3(void) /* FIXME : add RAM and ROM checks */ /* boot the bsp, what ever this means */ - boot_bsp(); + boot_card(); WATCHDOG_TRIGGER(); } |