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/cvme961 | |
| 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/cvme961')
| -rw-r--r-- | c/src/lib/libbsp/i960/cvme961/include/bsp.h | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/cvme961/startup/bspstart.c | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/i960/cvme961/include/bsp.h b/c/src/lib/libbsp/i960/cvme961/include/bsp.h index e00d525e7b..1547b40aa6 100644 --- a/c/src/lib/libbsp/i960/cvme961/include/bsp.h +++ b/c/src/lib/libbsp/i960/cvme961/include/bsp.h @@ -22,6 +22,7 @@ extern "C" { #endif #include <rtems.h> +#include <libcpu/i960CA.h> #include <iosupp.h> #include <console.h> #include <clockdrv.h> diff --git a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c index 7d89f1c09d..eab65eb1c0 100644 --- a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c +++ b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c @@ -108,7 +108,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 = CONFIGURE_INTERRUPT_STACK_MEMORY; - Cpu_table.Prcb = Prcb; BSP_Configuration.work_space_start = (void *) (RAM_END - BSP_Configuration.work_space_size); diff --git a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am index 01c85b4bbc..6e8b8865bd 100644 --- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am @@ -19,7 +19,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 |