rxgen960 compiles and links.

8 files changed, 88 insertions, 16 deletions

diff --git a/c/src/lib/libbsp/i960/rxgen960/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/Makefile.am
index 271e56ff1d..f2ded336ec 100644
--- a/c/src/lib/libbsp/i960/rxgen960/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/Makefile.am
@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUBDIRS = include startup clock console shmsupp timer wrapup
+SUBDIRS = include start startup clock console shmsupp timer wrapup
 
 include $(top_srcdir)/../../bsp.am
 
diff --git a/c/src/lib/libbsp/i960/rxgen960/bsp_specs b/c/src/lib/libbsp/i960/rxgen960/bsp_specs
index d081bbbd9e..aa7cda336c 100644
--- a/c/src/lib/libbsp/i960/rxgen960/bsp_specs
+++ b/c/src/lib/libbsp/i960/rxgen960/bsp_specs
@@ -15,7 +15,7 @@
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{qrtems: %{qrtems_debug: start_g.o%s} %{!qrtems_debug: start.o%s}
+%{qrtems: %{qrtems_debug: rxgen_romld_g.o%s} %{!qrtems_debug: rxgen_romld.o%s}}
 
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e _start}
diff --git a/c/src/lib/libbsp/i960/rxgen960/configure.in b/c/src/lib/libbsp/i960/rxgen960/configure.in
index 7863bfb9cf..133ca099fe 100644
--- a/c/src/lib/libbsp/i960/rxgen960/configure.in
+++ b/c/src/lib/libbsp/i960/rxgen960/configure.in
@@ -32,6 +32,7 @@ clock/Makefile
 console/Makefile
 include/Makefile
 shmsupp/Makefile
+start/Makefile
 startup/Makefile
 timer/Makefile
 wrapup/Makefile)
diff --git a/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am
new file mode 100644
index 0000000000..cfa756f655
--- /dev/null
+++ b/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am
@@ -0,0 +1,32 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+PGM = $(ARCH)/rxgen_romld.o
+
+S_FILES = rxgen_romld.S
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
+
+OBJS = $(S_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(PROJECT_RELEASE)/lib/rxgen_romld$(LIB_VARIANT).o: $(PGM)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rxgen_romld$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = rxgen_romld.S
+
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/rxgen_romld.S b/c/src/lib/libbsp/i960/rxgen960/start/rxgen_romld.S
index 4b2076c764..d6436f4b7b 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/rxgen_romld.S
+++ b/c/src/lib/libbsp/i960/rxgen960/start/rxgen_romld.S
@@ -7,10 +7,13 @@
 	BEGIN_CODE
 
 	.globl _romStart
+	.globl start
 	.globl _start
 	.globl _romFaultStart
 	.globl _led_array
 	.text   
+start:  /* JRS */
+_start:  /* JRS */
 SYM(romStart ): 
 SYM(_romStart ): 
           # This line is to make compiler happy.
@@ -121,3 +124,46 @@ SYM(led_array):
 	.byte 0xa
 	.byte 0xb
 	.byte 0xc
+
+
+/* just to compile and link application XXX JOEL */
+	.globl _faultStart
+	.globl _faultEnd
+	.globl _faultCheckSum
+	.globl _faultBuffer
+	.globl _svrStackPtr
+	.globl _console_pmr_getc
+	.globl _console_pmr_kbhit
+	.globl _console_pmr_init
+	.globl _console_pmr_putc
+	.globl _DBGConsole_make_sync
+	.globl _codeRamStart
+	.globl _codeRomStart
+	.globl _codeRamEnd
+	.globl _codeRomEnd
+	.globl _bssStart
+	.globl _bssEnd
+	.globl _bssStart_1
+	.globl _bssEnd_1
+	.globl _intStackPtr
+	
+_faultStart:
+_faultEnd:
+_faultCheckSum:
+_faultBuffer:
+_svrStackPtr:
+_console_pmr_getc:
+_console_pmr_kbhit:
+_console_pmr_init:
+_console_pmr_putc:
+_DBGConsole_make_sync:
+_codeRamStart:
+_codeRomStart:
+_codeRamEnd:
+_codeRomEnd:
+_bssStart:
+_bssEnd:
+_bssStart_1:
+_bssEnd_1:
+_intStackPtr:
+
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;
-}
-