2002-08-06 Joel Sherrill <joel@OARcorp.com>

* bsp_specs, configure.ac, startup/bspstart.c: Update and fix
	minor things so this BSP compiles and almost completely links.
	* startup/Makefile.am: New file.

c/src/lib/libbsp/or32/orp/ChangeLog

@@ -1,3 +1,9 @@
+2002-08-06	Joel Sherrill <joel@OARcorp.com>
+
+	* bsp_specs, configure.ac, startup/bspstart.c: Update and fix
+	minor things so this BSP compiles and almost completely links.
+	* startup/Makefile.am: New file.
+
 2002-08-06	Joel Sherrill <joel@OARcorp.com>
 
 	* include/.cvsignore: Updated to account for more files.

c/src/lib/libbsp/or32/orp/bsp_specs

@@ -1,12 +1,23 @@
 %rename cpp old_cpp
 %rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
 *cpp:
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} \
-%{qrtems: --start-group %{!qrtems_debug: -lrtemsall } %{qrtems_debug: -lrtemsall_g} \
- -lc -lgcc --end-group \
- %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group \
+%{!qrtems_debug: -lrtemsbsp -lrtemscpu} %{qrtems_debug: -lrtemsbsp_g -lrtemscpu_g} \
+-lc -lgcc --end-group \
+%{!qnolinkcmds: -T linkcmds%s}}
+
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: \
+%{!qrtems_debug: start.o%s} \
+%{qrtems_debug: start_g.o%s}}
+
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e _start}
 

c/src/lib/libbsp/or32/orp/configure.ac

@@ -3,7 +3,7 @@
 ## $Id$
 
 AC_PREREQ(2.52)
-AC_INIT([rtems-c-src-lib-libbsp-arm-armulator],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
+AC_INIT([rtems-c-src-lib-libbsp-or32-or32sim],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([bsp_specs])
 RTEMS_TOP(../../../../../..)
 AC_CONFIG_AUX_DIR(../../../../../..)
@@ -15,21 +15,6 @@ RTEMS_BSP_CONFIGURE
 RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
 RTEMS_CANONICALIZE_TOOLS
 
-# From newlib
-# Select which debug protocol is being used.
-# ARM_RDP_MONITOR selects the Demon monitor.
-# ARM_RDI_MONITOR selects the Angel monitor.
-# If neither are defined, then hard coded defaults will be used
-# to create the program's environment.
-
-RTEMS_BSPOPTS_SET([ARM_RDI_MONITOR],[*],[1])
-RTEMS_BSPOPTS_HELP([ARM_RDI_MONITOR],
-[If defined enable Angel monitor support])
-
-RTEMS_BSPOPTS_SET([ARM_RDP_MONITOR],[*],[])
-RTEMS_BSPOPTS_HELP([ARM_RDP_MONITOR],
-[If defined enable Demon monitor support])
-
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 clock/Makefile

c/src/lib/libbsp/or32/orp/startup/Makefile.am

@@ -0,0 +1,44 @@
+##
+## $Id$
+##
+
+
+VPATH = @srcdir@:@srcdir@/../../../shared
+
+PGM = $(ARCH)/startup.rel
+
+C_FILES = bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \
+    gnatinstallhandler.c 
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+S_FILES = 
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES) $(S_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(PGM): $(OBJS)
+	$(make-rel)
+
+bsplib_DATA = linkcmds
+
+$(PROJECT_RELEASE)/lib/linkcmds: linkcmds
+	$(INSTALL_DATA) $< $@
+
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
+
+all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = bspclean.c bspstart.c exit.c linkcmds setvec.c
+
+include $(top_srcdir)/../../../../../../automake/local.am

c/src/lib/libbsp/or32/orp/startup/bspstart.c

@@ -19,7 +19,7 @@
 #include <bsp.h>
 #include <rtems/libio.h>
  
-#include <libcsupport.h>
+#include <rtems/libcsupport.h>
  
 #include <string.h>
 extern int _mem_end;
@@ -35,8 +35,6 @@ rtems_configuration_table  BSP_Configuration;
 
 rtems_cpu_table Cpu_table;
 
-char *rtems_progname;
-
 /*
  *  Use the shared implementations of the following routines
  */
@@ -117,6 +115,4 @@ void bsp_start( void )
   rtems_initialize_executive( &BSP_Configuration, &Cpu_table );
 
   bsp_cleanup();
-
-  return 0;
 }

c/src/lib/libbsp/or32/orp/startup/main.c

@@ -1,37 +0,0 @@
-/*  main()
- *
- *  This is the entry point for the application.  It calls
- *  the bsp_start routine to the actual dirty work.
- *
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <bsp.h>
-
-int main(
-  int   argc,
-  char **argv,
-  char **environp
-)
-{
-  extern void bsp_start( int, char**, char ** );
-
-  bsp_start( argc, argv, environp );
-
-  /*
-   *  May be able to return to the "crt/start.s" code but also
-   *  may not be able to.  Do something here which is board dependent.
-   */
-
-  rtems_fatal_error_occurred( 0 );
-
-  return 0; /* just to satisfy the native compiler */
-}