2008-09-23 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, start/start.S: bsp_cleanup() had the same code which was
	executed when you returned from boot_card() to start.S. So just use
	the stub bsp_cleanup() implementation and remove a file.
	* startup/bspclean.c: Removed.

4 files changed, 11 insertions, 20 deletions

diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog
index 88f428abc6..0d77711ad5 100644
--- a/c/src/lib/libbsp/powerpc/psim/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-23	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, start/start.S: bsp_cleanup() had the same code which was
+	executed when you returned from boot_card() to start.S. So just use
+	the stub bsp_cleanup() implementation and remove a file.
+	* startup/bspclean.c: Removed.
+
 2008-09-19	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* include/bsp.h: Remove unused BSP_INIT_STACK_SIZE.
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index b47ea874ea..dfd300afbb 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -40,7 +40,7 @@ dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
 
-startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
+startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../shared/bsppretaskinghook.c \
     ../../shared/bsppredriverhook.c startup/bspstart.c \
     ../../powerpc/shared/startup/bspgetworkarea.c ../../shared/bootcard.c \
diff --git a/c/src/lib/libbsp/powerpc/psim/start/start.S b/c/src/lib/libbsp/powerpc/psim/start/start.S
index 95a5a52b20..8ff452c67b 100644
--- a/c/src/lib/libbsp/powerpc/psim/start/start.S
+++ b/c/src/lib/libbsp/powerpc/psim/start/start.S
@@ -113,8 +113,8 @@ _start:
 	/* Let her rip */
 	bl	FUNC_NAME(boot_card)
 
-	/* return value from boot_card is argument to exit */
-	bl	FUNC_NAME(exit)
-	trap
+	li  10,99			/* 0x63 */
+  	sc
+
 .Lstart:
 	.size	_start,.Lstart-_start
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/bspclean.c b/c/src/lib/libbsp/powerpc/psim/startup/bspclean.c
deleted file mode 100644
index d63dc0a10d..0000000000
--- a/c/src/lib/libbsp/powerpc/psim/startup/bspclean.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- *  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.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-void bsp_cleanup( void )
-{
-  asm volatile( "li  10,99" );  /* 0x63 */
-  asm volatile( "sc" );
-}