diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-07-11 19:31:04 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-07-11 19:31:04 +0000 |
| commit | bc85fd5a6df8753543ba55c98a588e255471752b (patch) | |
| tree | b51e3eb5c77cca042081bb7ba88e5515560451d2 /c/src/lib/libbsp/i960/i960sim | |
| parent | Patch rtems-rc-20000711-2-cvs.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-bc85fd5a6df8753543ba55c98a588e255471752b.tar.bz2 | |
Reworked score/cpu/i960 so it can be safely compiled multilib. All
routines and structures that require CPU model specific information
are now in libcpu. This required significant rework of the
score/cpu header files and the creation of multiple header files
and subdirectories in libcpu/i960.
Diffstat (limited to 'c/src/lib/libbsp/i960/i960sim')
| -rw-r--r-- | c/src/lib/libbsp/i960/i960sim/include/bsp.h | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/i960sim/startup/bspstart.c | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/i960/i960sim/include/bsp.h b/c/src/lib/libbsp/i960/i960sim/include/bsp.h index 691ed73a25..ac8ecb48bb 100644 --- a/c/src/lib/libbsp/i960/i960sim/include/bsp.h +++ b/c/src/lib/libbsp/i960/i960sim/include/bsp.h @@ -13,8 +13,8 @@ * $Id$ */ -#ifndef __CVME961_h -#define __CVME961_h +#ifndef __I960SIM_h +#define __I960SIM_h #ifdef __cplusplus extern "C" { diff --git a/c/src/lib/libbsp/i960/i960sim/startup/bspstart.c b/c/src/lib/libbsp/i960/i960sim/startup/bspstart.c index f93fb3c6b9..e5b840d472 100644 --- a/c/src/lib/libbsp/i960/i960sim/startup/bspstart.c +++ b/c/src/lib/libbsp/i960/i960sim/startup/bspstart.c @@ -77,6 +77,10 @@ void bsp_pretasking_hook(void) * This routine does the bulk of the system initialization. */ +#include <libcpu/i960KA.h> + +i960_PRCB *Prcb; /* to satisfy linking */ + void bsp_start( void ) { extern int _end; @@ -86,7 +90,6 @@ void bsp_start( void ) Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ Cpu_table.postdriver_hook = bsp_postdriver_hook; Cpu_table.interrupt_stack_size = 4096; - Cpu_table.Prcb = 0; /* Prcb; */ if ( BSP_Configuration.work_space_size >(512*1024) ) _sys_exit( 1 ); diff --git a/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am b/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am index d79cd51a66..ae52204fdb 100644 --- a/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am @@ -11,7 +11,8 @@ include $(top_srcdir)/../../../../../../automake/lib.am # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ + $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a |