diff options
Diffstat (limited to 'c/src/lib/libbsp/i960/rxgen960')
-rw-r--r-- | c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/rxgen960/include/bsp.h | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c | 16 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/rxgen960/timer/timer.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am | 3 |
8 files changed, 6 insertions, 23 deletions
diff --git a/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c b/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c index 20b7ea3144..cc42884639 100644 --- a/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c +++ b/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c @@ -22,7 +22,6 @@ #include <stdlib.h> #include <bsp.h> -#include <i960RP.h> #include <rtems/libio.h> #define CLOCK_VECTOR 0x92 diff --git a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h index 4256629165..52343f6bbe 100644 --- a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h +++ b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h @@ -22,6 +22,7 @@ extern "C" { #endif #include <rtems.h> +#include <libcpu/i960RP.h> #include <iosupp.h> #include <console.h> #include <clockdrv.h> diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c index bc4ddfcff8..bfed470ce3 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c +++ b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c @@ -28,13 +28,8 @@ #include <string.h> #include <fcntl.h> #include <stdio.h> -#include "i960RP.h" #include <rtems/libio.h> -#ifdef STACK_CHECKER_ON -#include <stackchk.h> -#endif - #define HEAP_SIZE 1024*1024*2 /* @@ -84,16 +79,6 @@ bsp_pretasking_hook(void) bsp_libc_init((void *) heap_start, 64 * 1024, 0); -#ifdef STACK_CHECKER_ON - /* - * Initialize the stack bounds checker - * We can either turn it on here or from the app. - */ - -*(unsigned char *)(0x120f) = 0xe; - Stack_check_Initialize(); -#endif - #ifdef RTEMS_DEBUG rtems_debug_enable( RTEMS_DEBUG_ALL_MASK ); #endif @@ -134,7 +119,6 @@ bsp_start(void) Cpu_table.do_zero_of_workspace = TRUE; Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; Cpu_table.extra_mpci_receive_server_stack = 0; - Cpu_table.Prcb = Prcb; /* just trying to get along */ Cpu_table.stack_allocate_hook = 0; diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c b/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c index 07835ede2a..252a11d7eb 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c +++ b/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c @@ -6,7 +6,7 @@ * $Id$ */ -#include "i960RP.h" +#include <bsp.h> #include "cntrltbl.h" /*-------------------------------------*/ /* Control Table. diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c b/c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c index 6f3d97d6b0..fcaf48e06f 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c +++ b/c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c @@ -6,7 +6,7 @@ * $Id$ */ -#include <i960RP.h> +#include <bsp.h> #include "cntrltbl.h" /*-------------------------------------*/ /* Control Table. diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c b/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c index 83e456c7aa..d65d0109cd 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c +++ b/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c @@ -9,7 +9,7 @@ #include "rom_ibr.h" #include "prcb.h" #include "cntrltbl.h" -#include <i960RP.h> +#include <bsp.h> #include "../include/rxgen960_config.h" /*-------------------------------------*/ extern void romStart(void); diff --git a/c/src/lib/libbsp/i960/rxgen960/timer/timer.c b/c/src/lib/libbsp/i960/rxgen960/timer/timer.c index 8b166090e2..eabb33d81a 100644 --- a/c/src/lib/libbsp/i960/rxgen960/timer/timer.c +++ b/c/src/lib/libbsp/i960/rxgen960/timer/timer.c @@ -27,10 +27,8 @@ */ -#include <rtems.h> #include <bsp.h> #include <stdlib.h> -#include <i960RP.h> #include <rtems/libio.h> diff --git a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am index e3dd06fc1e..3cf65c86c2 100644 --- a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am @@ -19,7 +19,8 @@ BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ + $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a # |