rxgen960 compiles and links.

4 files changed, 7 insertions, 137 deletions

diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
index 95071ef9ee..bdd6297231 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
@@ -10,15 +10,16 @@ PGM = $(ARCH)/startup.rel
 
 #C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \
 #    gnatinstallhandler
-C_FILES = bspstart.c cntrltbl.c exit.c fault.c flttbl.c frmstr.c intrtbl.c \
-    kkprintf.c nmi.c nulsystbl.c prcb.c rom_cntrltbl.c rom_ibr.c rom_prcb.c \
-    sctns.c setvec.c systbl.c
+C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c cntrltbl.c \
+    exit.c fault.c flttbl.c frmstr.c intrtbl.c kkprintf.c main.c nmi.c \
+    nulsystbl.c prcb.c rom_cntrltbl.c rom_ibr.c rom_prcb.c sbrk.c sctns.c \
+    setvec.c systbl.c
 
 H_FILES = asmfault.h asmstub.h cntrltbl.h fault.h faultret.h flttbl.h \
     frmstr.h i960.h ihandler.h intrtbl.h main.h memchnl.h pmc901_memmap.h \
     prcb.h rom_ibr.h rommon.h sctns.h systbl.h time.h types.h
 
-S_FILES = asmfault.S asmstub.S ihandler.S rxgen_romld.S
+S_FILES = asmfault.S asmstub.S ihandler.S
 
 OBJS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
 
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/exit.c b/c/src/lib/libbsp/i960/rxgen960/startup/exit.c
index 12aa1ab480..3e3b46fbcc 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/exit.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/exit.c
@@ -24,6 +24,7 @@
 #include <rtems.h>
 #include "bsp.h"
 
+#if 0
 void _exit( )
 {
   asm volatile( "mov   0,g0; \
@@ -36,3 +37,4 @@ void _exit( )
   *  application if the user types "go".
   */
 }
+#endif
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/kkprintf.c b/c/src/lib/libbsp/i960/rxgen960/startup/kkprintf.c
index e3c05b24e5..5ff6807610 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/kkprintf.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/kkprintf.c
@@ -56,13 +56,3 @@ kkputs( const char * buf)
 		*consoleOP = (unsigned int)c;
 	}
 }
-
-
-/* we have got an error during build for 'isatty()' wo/ good reason
-   we temporarily use this fix....
-*/
-isatty(int fd)
-{
-        return 1;
-}
-
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/rxgen_romld.S b/c/src/lib/libbsp/i960/rxgen960/startup/rxgen_romld.S
deleted file mode 100644
index 4b2076c764..0000000000
--- a/c/src/lib/libbsp/i960/rxgen960/startup/rxgen_romld.S
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *  $Id$
- */
-
-#include "asm.h" 
-
-	BEGIN_CODE
-
-	.globl _romStart
-	.globl _start
-	.globl _romFaultStart
-	.globl _led_array
-	.text   
-SYM(romStart ): 
-SYM(_romStart ): 
-          # This line is to make compiler happy.
-	mov	0, g14
-        ldconst 0x120f,r10   # BIST register
-/*
-	 Setup code for in memory loaded image
-*/
-/*
-	  # Interrupt stack is used by default.
-	  # Copy all code (except Fault Table and Fault Handler)
-	  # from EPROM into DRAM.
-*/
-        ldconst 0x120f,r10   //# BIST register
-	ldconst 0x2,r3
-	stob	r3,0(r10)	//# 2->LED
-/*
-	  # Zero all uninitialized data
-*/
-	callx	_zeroBss
-        ldconst 0x120f,r10   //# BIST register
-	ldconst 0x3,r3
-	stob	r3,0(r10)	//# 3->LED
-/*
-	  # And reinitialize processor.
-	  # _start is a few lines below.
-	  # _prcb is RAM-based struct PRCB.
-*/
-	ldconst	0x300, r4
-	ldconst	_pmc_start, r5
-	ldconst	_ram_prcb, r6
-	sysctl	r4, r5, r6
-/*
-	  # This point will never be reached.
-*/
-
-SYM(_pmc_start) :  
-SYM(pmc_start) :  
-        ldconst 0x120f,r10   # BIST register
-	ldconst 0x4,r3
-	stob	r3,0(r10)	//# 4->LED
-	mov	0, g14
-/*
-	  # To get ready to invoke procedures.
-	  # I'll use supervisor stack.
-*/
-
-	ldconst	_svrStackPtr, fp
-	lda	16*4(fp), sp 
-	ldconst 0x5,r3
-	stob	r3,0(r10)	//# 5->LED
-
-	ldconst	0x1F0000, r4
-	ldconst	0x1F2000, r3
-	ldconst	0, r5
-	modpc	r4, r3, r5
-
-	ldconst 7,r3
-	stob	r3,0(r10)	//# 7->LED
-
-	callx	_rx_boot_card
-/*	  # if _romMain ever returns ...	*/
-	b	_romExit
-
-SYM(romFaultStart) :  
-SYM(_romFaultStart) :  
-
-	mov	0, g14
-
-	/* ldconst	0, sf0 XXX JRS */
-/*
-	  # To get ready to invoke procedures.
-	  # I'll use supervisor stack.
-	  # _svrStackPtr is defined directly in rom.ld.
-*/
-	ldconst	_svrStackPtr, fp
-	lda	16*4(fp), sp 
-/*
-	  # Set processor priority to zero.
-*/
-	ldconst	0x1F0000, r4
-	ldconst	0, r5
-	modpc	r4, r4, r5
-//	  # Now to real code
-// Fix this up	callx	_romFaultMain
-	callx	_rx_boot_card
-//	  # if _romMain ever returns ...	
-	b	_romExit
-
-_romExit :
-//	  # if _romMain ever returns ...
-//	fmark
-	b	_romExit
-
-
-
-SYM(led_array):
-	.byte 99
-	.byte 1
-	.byte 2
-	.byte 3
-	.byte 4
-	.byte 5
-	.byte 6
-	.byte 7
-	.byte 8
-	.byte 9
-	.byte 0xa
-	.byte 0xb
-	.byte 0xc