Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de> that splits

boot_card() and main() into separate files to ease configuration
of other packages.  This was a big step in the way to build TCL,
ncurses, and zlib for RTEMS.
This commit is contained in:
Joel Sherrill
1999-07-02 18:57:11 +00:00
parent a0a225f4aa
commit c8d91839ff
36 changed files with 131 additions and 121 deletions

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/comm:@srcdir@/..
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk irq irq_init i386-stub-glue uart i386-stub gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk irq irq_init i386-stub-glue uart i386-stub gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/irq:@srcdir@/../
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bsplibc bsppost bspstart exit irq irq_init main sbrk i386-stub i386-stub-glue uart pcibios gnatinstallhandler
C_PIECES=bsplibc bsppost bspstart exit irq irq_init bootcard main sbrk i386-stub i386-stub-glue uart pcibios gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/comm:@srcdir@/..
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk irq irq_init i386-stub-glue uart i386-stub gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk irq irq_init i386-stub-glue uart i386-stub gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec vmeintr gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec vmeintr gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bsplibc bsppost bspstart bspclean main sbrk setvec gnatinstallhandler
C_PIECES=bsplibc bsppost bspstart bspclean bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bsplibc bsppost bspstart bspclean efi68k_tcp efi68k_wd main sbrk setvec gnatinstallhandler
C_PIECES=bsplibc bsppost bspstart bspclean efi68k_tcp efi68k_wd bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart init68340 main sbrk setvec dumpanic gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart init68340 bootcard main sbrk setvec dumpanic gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=alloc360 bspclean bsplibc bsppost bspstart init68360 main sbrk setvec gnatinstallhandler
C_PIECES=alloc360 bspclean bsplibc bsppost bspstart init68360 bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../mvme147/startup:@srcdir@/../../shared:@srcdir@/.
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main page_table sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main page_table sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main page_table sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main page_table sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,8 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=crc debugport gdb-hooks main m68302scc m68k-stub memcheck trace \
gnatinstallhandler bsplibc bsppost bspstart bspclean sbrk setvec
C_PIECES=crc debugport gdb-hooks bootcard main m68302scc m68k-stub memcheck trace gnatinstallhandler bsplibc bsppost bspstart bspclean sbrk setvec
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec inittlb gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec inittlb gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec genpvec vmeintr gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec genpvec vmeintr gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec alloc860 mmu gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec alloc860 mmu gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -9,7 +9,7 @@ RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
# C source names, if any, go here -- minus the .c
C_PIECES=main bspstart bsppost bsplibc sbrk bspclean gnatinstallhandler
C_PIECES=bootcard main bspstart bsppost bsplibc sbrk bspclean gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -9,7 +9,7 @@ RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
# C source names, if any, go here -- minus the .c
C_PIECES=main bspstart bsppost bsplibc sbrk bspclean gnatinstallhandler
C_PIECES=bootcard main bspstart bsppost bsplibc sbrk bspclean gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -36,9 +36,9 @@ include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
include $(RTEMS_ROOT)/make/leaf.cfg
# Files expected to be from the shared directory:
# sbrk main bsplibc bsppost
# sbrk bootcard main bsplibc bsppost
STARTUP_PIECES=bspstart bspclean sbrk setvec spurious genpvec swap \
main bsplibc bsppost
main bootcard bsplibc bsppost
#
# (OPTIONAL) Add local stuff here using +=

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec gnatinstallhandler
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec \
C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \
Hwr_init spurious genpvec $(STARTUP_PIECES) gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -18,7 +18,7 @@ VPATH=@srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bsplibc bsppost bspstart bspclean sbrk main gnatinstallhandler
C_PIECES=bsplibc bsppost bspstart bspclean sbrk bootcard main gnatinstallhandler
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -0,0 +1,96 @@
/*
* A simple main which can be used on any embedded target.
*
* This style of initialization insures that the C++ global
* constructors are executed after RTEMS is initialized.
*
* Thanks to Chris Johns <cjohns@plessey.com.au> for this idea.
*
* COPYRIGHT (c) 1989-1998.
* On-Line Applications Research Corporation (OAR).
* Copyright assigned to U.S. Government, 1994.
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.OARcorp.com/rtems/license.html.
*
* $Id$
*/
#include <bsp.h>
extern void bsp_start( void );
extern void bsp_cleanup( void );
extern rtems_configuration_table Configuration;
extern rtems_configuration_table BSP_Configuration;
extern rtems_cpu_table Cpu_table;
rtems_interrupt_level bsp_isr_level;
/*
* Since there is a forward reference
*/
int main(int argc, char **argv);
int boot_card(int argc, char **argv)
{
int status;
/*
* Set default values for the CPU Table fields all ports must have.
* These values can be overridden in bsp_start() but they are
* right most of the time.
*/
Cpu_table.pretasking_hook = NULL;
Cpu_table.predriver_hook = NULL;
Cpu_table.postdriver_hook = NULL;
Cpu_table.idle_task = NULL;
Cpu_table.do_zero_of_workspace = TRUE;
Cpu_table.interrupt_stack_size = RTEMS_MINIMUM_STACK_SIZE;
Cpu_table.extra_mpci_receive_server_stack = 0;
Cpu_table.stack_allocate_hook = NULL;
Cpu_table.stack_free_hook = NULL;
/*
* Copy the configuration table so we and the BSP wants to change it.
*/
BSP_Configuration = Configuration;
/*
* The atexit hook will be before the static destructor list's entry
* point.
*/
bsp_start();
/*
* Initialize RTEMS but do NOT start multitasking.
*/
bsp_isr_level =
rtems_initialize_executive_early( &BSP_Configuration, &Cpu_table );
/*
* Call main() and get the global constructors invoked if there
* are any.
*/
status = main(argc, argv);
/*
* Perform any BSP specific shutdown actions.
*/
bsp_cleanup();
/*
* Now return to the start code.
*/
return status;
}

View File

@@ -21,95 +21,10 @@
char *rtems_progname;
extern void bsp_start( void );
extern void bsp_cleanup( void );
extern rtems_configuration_table Configuration;
extern rtems_configuration_table BSP_Configuration;
extern rtems_cpu_table Cpu_table;
#if defined(USE_INIT_FINI)
extern void _fini( void );
extern void _init( void );
#endif
rtems_interrupt_level bsp_isr_level;
/*
* Since there is a forward reference
*/
int main(int argc, char **argv);
int boot_card(int argc, char **argv)
{
int status;
/*
* Set default values for the CPU Table fields all ports must have.
* These values can be overridden in bsp_start() but they are
* right most of the time.
*/
Cpu_table.pretasking_hook = NULL;
Cpu_table.predriver_hook = NULL;
Cpu_table.postdriver_hook = NULL;
Cpu_table.idle_task = NULL;
Cpu_table.do_zero_of_workspace = TRUE;
Cpu_table.interrupt_stack_size = RTEMS_MINIMUM_STACK_SIZE;
Cpu_table.extra_mpci_receive_server_stack = 0;
Cpu_table.stack_allocate_hook = NULL;
Cpu_table.stack_free_hook = NULL;
/*
* Copy the configuration table so we and the BSP wants to change it.
*/
BSP_Configuration = Configuration;
/*
* The atexit hook will be before the static destructor list's entry
* point.
*/
bsp_start();
/*
* Initialize RTEMS but do NOT start multitasking.
*/
bsp_isr_level =
rtems_initialize_executive_early( &BSP_Configuration, &Cpu_table );
/*
* Call main() and get the global constructors invoked if there
* are any.
*/
#if defined(USE_INIT_FINI)
atexit( _fini );
_init();
#endif
status = main(argc, argv);
/*
* Perform any BSP specific shutdown actions.
*/
bsp_cleanup();
/*
* Now return to the start code.
*/
return status;
}
int main(int argc, char **argv)
{
if ((argc > 0) && argv && argv[0])
rtems_progname = argv[0];
else

View File

@@ -18,7 +18,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
PGM=${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c
C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec spurious
C_PIECES=bspclean bsplibc bsppost bspstart main bootcard sbrk setvec spurious
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

View File

@@ -45,7 +45,7 @@ CXX_MAIN=rtems-ctor
C_MAIN=
else
CXX_MAIN=
C_MAIN=main
C_MAIN=main bootcard
endif
#