Index: c/src/lib/libbsp/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/ChangeLog,v
retrieving revision 1.63
diff -p -u -u -r1.63 ChangeLog
--- c/src/lib/libbsp/ChangeLog	11 Dec 2008 10:27:20 -0000	1.63
+++ c/src/lib/libbsp/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,8 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* Makefile.am: Add bspinit.c, a common Init task that manages
+	command line arguments from a BSP.
+
 2008-12-11	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* shared/clockdrv_shell.c: Turn warning into error.
Index: c/src/lib/libbsp/Makefile.am
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/Makefile.am,v
retrieving revision 1.25
diff -p -u -u -r1.25 Makefile.am
--- c/src/lib/libbsp/Makefile.am	26 Sep 2008 05:40:00 -0000	1.25
+++ c/src/lib/libbsp/Makefile.am	24 Apr 2009 07:09:15 -0000
@@ -10,10 +10,10 @@ DIST_SUBDIRS = @libbsp_cpu_subdir@
 EXTRA_DIST = MERGE.PROCEDURE bsp.am
 
 # shared
-EXTRA_DIST += shared/bootcard.c shared/bspclean.c shared/bsplibc.c \
-    shared/bsppost.c shared/console-polled.c shared/console.c \
-    shared/gnatinstallhandler.c shared/sbrk.c shared/tod.c \
-    shared/tod.h
+EXTRA_DIST += shared/bootcard.c shared/bspclean.c shared/bspinit.c \
+    shared/bsplibc.c shared/bsppost.c shared/console-polled.c \
+    shared/console.c shared/gnatinstallhandler.c shared/sbrk.c \
+    shared/tod.c shared/tod.h
 EXTRA_DIST += shared/vmeUniverse/vmeUniverse.c \
     shared/vmeUniverse/vmeUniverse.h \
     shared/vmeUniverse/vmeUniverseDMA.h \
Index: c/src/lib/libbsp/arm/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/ChangeLog,v
retrieving revision 1.67
diff -p -u -u -r1.67 ChangeLog
--- c/src/lib/libbsp/arm/ChangeLog	12 Mar 2009 14:18:11 -0000	1.67
+++ c/src/lib/libbsp/arm/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* shared/start/start.S: Update for boot_card command line change.
+
 2009-03-12	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1385/cpukit
Index: c/src/lib/libbsp/arm/csb336/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/csb336/ChangeLog,v
retrieving revision 1.53
diff -p -u -u -r1.53 ChangeLog
--- c/src/lib/libbsp/arm/csb336/ChangeLog	6 Jan 2009 16:26:21 -0000	1.53
+++ c/src/lib/libbsp/arm/csb336/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-01-06	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1350/bsps
Index: c/src/lib/libbsp/arm/csb336/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/csb336/start/start.S,v
retrieving revision 1.3
diff -p -u -u -r1.3 start.S
--- c/src/lib/libbsp/arm/csb336/start/start.S	12 Mar 2007 11:18:44 -0000	1.3
+++ c/src/lib/libbsp/arm/csb336/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -12,7 +12,11 @@
  * $Id: start.S,v 1.3 2007/03/12 11:18:44 joel Exp $
  */
 
-                
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+         
 /* Some standard definitions...*/
 .equ PSR_MODE_USR,       0x10
 .equ PSR_MODE_FIQ,       0x11
Index: c/src/lib/libbsp/arm/csb337/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/csb337/ChangeLog,v
retrieving revision 1.46
diff -p -u -u -r1.46 ChangeLog
--- c/src/lib/libbsp/arm/csb337/ChangeLog	5 Dec 2008 13:37:41 -0000	1.46
+++ c/src/lib/libbsp/arm/csb337/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-05	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bsp_specs: Remove -Qy from *link.
Index: c/src/lib/libbsp/arm/csb337/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/csb337/start/start.S,v
retrieving revision 1.2
diff -p -u -u -r1.2 start.S
--- c/src/lib/libbsp/arm/csb337/start/start.S	12 Mar 2007 11:18:47 -0000	1.2
+++ c/src/lib/libbsp/arm/csb337/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -12,6 +12,10 @@
  *  $Id: start.S,v 1.2 2007/03/12 11:18:47 joel Exp $
 */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
                 
 /* Some standard definitions...*/
 .equ PSR_MODE_USR,       0x10
Index: c/src/lib/libbsp/arm/edb7312/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/edb7312/ChangeLog,v
retrieving revision 1.96
diff -p -u -u -r1.96 ChangeLog
--- c/src/lib/libbsp/arm/edb7312/ChangeLog	5 Dec 2008 13:37:43 -0000	1.96
+++ c/src/lib/libbsp/arm/edb7312/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-05	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bsp_specs: Remove -Qy from *link.
Index: c/src/lib/libbsp/arm/edb7312/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/edb7312/start/start.S,v
retrieving revision 1.6
diff -p -u -u -r1.6 start.S
--- c/src/lib/libbsp/arm/edb7312/start/start.S	21 Apr 2004 16:01:32 -0000	1.6
+++ c/src/lib/libbsp/arm/edb7312/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -14,6 +14,11 @@
  *  $Id: start.S,v 1.6 2004/04/21 16:01:32 ralf Exp $
 */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 /* Some standard definitions...*/
 
 .equ Mode_USR,        	     0x10
Index: c/src/lib/libbsp/arm/gba/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/gba/ChangeLog,v
retrieving revision 1.52
diff -p -u -u -r1.52 ChangeLog
--- c/src/lib/libbsp/arm/gba/ChangeLog	12 Mar 2009 14:18:07 -0000	1.52
+++ c/src/lib/libbsp/arm/gba/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-03-12	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1385/cpukit
Index: c/src/lib/libbsp/arm/gba/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/gba/start/start.S,v
retrieving revision 1.1
diff -p -u -u -r1.1 start.S
--- c/src/lib/libbsp/arm/gba/start/start.S	6 Jul 2005 18:46:04 -0000	1.1
+++ c/src/lib/libbsp/arm/gba/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -50,6 +50,11 @@
  * INABILITY TO USE THIS CODE.
  *****************************************************************************/
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #define __asm__
 #include <rtems/asm.h>
 #include <asm_macros.h>
Index: c/src/lib/libbsp/arm/gp32/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/gp32/ChangeLog,v
retrieving revision 1.46
diff -p -u -u -r1.46 ChangeLog
--- c/src/lib/libbsp/arm/gp32/ChangeLog	4 Dec 2008 20:30:15 -0000	1.46
+++ c/src/lib/libbsp/arm/gp32/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/arm/gp32/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/gp32/start/start.S,v
retrieving revision 1.2
diff -p -u -u -r1.2 start.S
--- c/src/lib/libbsp/arm/gp32/start/start.S	12 Mar 2007 11:18:49 -0000	1.2
+++ c/src/lib/libbsp/arm/gp32/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -11,7 +11,11 @@
  *  $Id: start.S,v 1.2 2007/03/12 11:18:49 joel Exp $
  */
 
-                
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+        
 /* Some standard definitions...*/
 .equ PSR_MODE_USR,       0x10
 .equ PSR_MODE_FIQ,       0x11
Index: c/src/lib/libbsp/arm/nds/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/nds/ChangeLog,v
retrieving revision 1.31
diff -p -u -u -r1.31 ChangeLog
--- c/src/lib/libbsp/arm/nds/ChangeLog	4 Feb 2009 15:42:03 -0000	1.31
+++ c/src/lib/libbsp/arm/nds/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-02-04	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Add -D__BSD_VISIBLE to wifi_rel_CPPFLAGS.
Index: c/src/lib/libbsp/arm/nds/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/nds/start/start.S,v
retrieving revision 1.1
diff -p -u -u -r1.1 start.S
--- c/src/lib/libbsp/arm/nds/start/start.S	16 Apr 2008 18:37:33 -0000	1.1
+++ c/src/lib/libbsp/arm/nds/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,8 @@
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+
 @---------------------------------------------------------------------------------
 @ DS processor selection
 @---------------------------------------------------------------------------------
@@ -201,8 +206,7 @@ _start:
 	ldr	r3, =initSystem
 	blx	r3			@ jump to user code
 
-	mov	r1, #0		@ argv
-	mov	r0, #0		@ argc
+	mov	r0, #0		@ command line
 
 
 	ldr	r3, =boot_card
Index: c/src/lib/libbsp/arm/rtl22xx/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/rtl22xx/ChangeLog,v
retrieving revision 1.39
diff -p -u -u -r1.39 ChangeLog
--- c/src/lib/libbsp/arm/rtl22xx/ChangeLog	2 Mar 2009 17:03:10 -0000	1.39
+++ c/src/lib/libbsp/arm/rtl22xx/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-03-02	Ray Xu <rayx.cn@gmail.com>
 
 	PR 1380/bsps
Index: c/src/lib/libbsp/arm/rtl22xx/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/rtl22xx/start/start.S,v
retrieving revision 1.4
diff -p -u -u -r1.4 start.S
--- c/src/lib/libbsp/arm/rtl22xx/start/start.S	6 Nov 2007 22:50:42 -0000	1.4
+++ c/src/lib/libbsp/arm/rtl22xx/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -12,6 +12,11 @@
  *  $Id: start.S,v 1.4 2007/11/06 22:50:42 joel Exp $
 */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 /* Some standard definitions...*/
 
 /* Some standard definitions...*/
Index: c/src/lib/libbsp/arm/shared/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/shared/start/start.S,v
retrieving revision 1.2
diff -p -u -u -r1.2 start.S
--- c/src/lib/libbsp/arm/shared/start/start.S	27 Feb 2009 11:26:44 -0000	1.2
+++ c/src/lib/libbsp/arm/shared/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -16,6 +16,11 @@
  * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE.
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #include <bsp/linker-symbols.h>
 #include <bsp/start.h>
 
Index: c/src/lib/libbsp/avr/avrtest/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/avr/avrtest/ChangeLog,v
retrieving revision 1.2
diff -p -u -u -r1.2 ChangeLog
--- c/src/lib/libbsp/avr/avrtest/ChangeLog	4 Dec 2008 20:33:50 -0000	1.2
+++ c/src/lib/libbsp/avr/avrtest/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs, start/start.S: Move -e start from *link to *startfile to
Index: c/src/lib/libbsp/avr/avrtest/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/avr/avrtest/start/start.S,v
retrieving revision 1.2
diff -p -u -u -r1.2 start.S
--- c/src/lib/libbsp/avr/avrtest/start/start.S	4 Dec 2008 20:33:50 -0000	1.2
+++ c/src/lib/libbsp/avr/avrtest/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,6 @@
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning Please check and remove these warnings.
 
 #define SPL 0x3d
 #define SPH 0x3e
Index: c/src/lib/libbsp/bfin/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/bfin/ChangeLog,v
retrieving revision 1.16
diff -p -u -u -r1.16 ChangeLog
--- c/src/lib/libbsp/bfin/ChangeLog	25 Sep 2008 14:10:51 -0000	1.16
+++ c/src/lib/libbsp/bfin/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* shared/start/start.S: Update for boot_card command line change.
+
 2008-09-25	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* shared/start/start.S: Add BFIN_ON_SKYEYE define to disable features
Index: c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog,v
retrieving revision 1.14
diff -p -u -u -r1.14 ChangeLog
--- c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog	4 Dec 2008 20:31:37 -0000	1.14
+++ c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/bfin/bf537Stamp/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/bfin/bf537Stamp/start/start.S,v
retrieving revision 1.1
diff -p -u -u -r1.1 start.S
--- c/src/lib/libbsp/bfin/bf537Stamp/start/start.S	15 Aug 2008 20:21:00 -0000	1.1
+++ c/src/lib/libbsp/bfin/bf537Stamp/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -7,6 +7,10 @@
 #include <libcpu/cecRegs.h>
 #include <libcpu/coreTimerRegs.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning Please check and remove these warnings.
+
 #ifndef LO
 #define LO(con32) ((con32) & 0xFFFF)
 #endif
Index: c/src/lib/libbsp/bfin/shared/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/bfin/shared/start/start.S,v
retrieving revision 1.6
diff -p -u -u -r1.6 start.S
--- c/src/lib/libbsp/bfin/shared/start/start.S	25 Sep 2008 14:10:51 -0000	1.6
+++ c/src/lib/libbsp/bfin/shared/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -4,6 +4,10 @@
 
 #include <bspopts.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning Please check and remove these warnings.
+
 #ifndef LO
 #define LO(con32) ((con32) & 0xFFFF)
 #endif
Index: c/src/lib/libbsp/c4x/c4xsim/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/c4x/c4xsim/ChangeLog,v
retrieving revision 1.98
diff -p -u -u -r1.98 ChangeLog
--- c/src/lib/libbsp/c4x/c4xsim/ChangeLog	4 Dec 2008 20:32:39 -0000	1.98
+++ c/src/lib/libbsp/c4x/c4xsim/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/c4x/c4xsim/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/c4x/c4xsim/start/start.S,v
retrieving revision 1.2
diff -p -u -u -r1.2 start.S
--- c/src/lib/libbsp/c4x/c4xsim/start/start.S	21 Apr 2004 10:42:43 -0000	1.2
+++ c/src/lib/libbsp/c4x/c4xsim/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -3,6 +3,11 @@
  *  provided by Herman ...XXX
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+
 	; .file	"crt0.s"
 	.ref	_c_int00
 	.global	start
@@ -65,7 +70,7 @@ _c_int00:
         ldi     @stack_addr,sp
         ldi     sp,ar3
         ldp     .bss		; For the small model, set up the DP to .bss
-	ldi	0,ar2		; make sure argc=0 with regparm
+	ldi	0,ar2		; make sure cmdline=0 with regparm
 	push	ar2		; and memparm
         call    _boot_card
         call	_sim_exit
Index: c/src/lib/libbsp/h8300/h8sim/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/h8300/h8sim/ChangeLog,v
retrieving revision 1.106
diff -p -u -u -r1.106 ChangeLog
--- c/src/lib/libbsp/h8300/h8sim/ChangeLog	4 Dec 2008 20:33:14 -0000	1.106
+++ c/src/lib/libbsp/h8300/h8sim/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/h8300/h8sim/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/h8300/h8sim/start/start.S,v
retrieving revision 1.2
diff -p -u -u -r1.2 start.S
--- c/src/lib/libbsp/h8300/h8sim/start/start.S	21 Apr 2004 10:42:43 -0000	1.2
+++ c/src/lib/libbsp/h8300/h8sim/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -1,5 +1,10 @@
 ; h8/300 and h8/300h start up file.
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #ifdef __H8300__
 
 	.text
Index: c/src/lib/libbsp/i386/i386ex/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/i386ex/ChangeLog,v
retrieving revision 1.129
diff -p -u -u -r1.129 ChangeLog
--- c/src/lib/libbsp/i386/i386ex/ChangeLog	10 Feb 2009 10:03:14 -0000	1.129
+++ c/src/lib/libbsp/i386/i386ex/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-02-10	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* clock/ckinit.c, startup/bspstart.c: Add prototypes.
Index: c/src/lib/libbsp/i386/i386ex/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/i386ex/start/start.S,v
retrieving revision 1.11
diff -p -u -u -r1.11 start.S
--- c/src/lib/libbsp/i386/i386ex/start/start.S	21 Apr 2004 16:01:32 -0000	1.11
+++ c/src/lib/libbsp/i386/i386ex/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -467,9 +467,7 @@ SYM (zero_bss):
 /*
  *  Transfer control to User's Board Support Package
  */
-        pushl   $0                       # environp
-        pushl   $0                       # argv
-        pushl   $0                       # argc
+        pushl   $0                       # command line
 
 	movw    $0xFFFB, SYM(i8259s_cache)	# ICU mask values reflect
 						# initial ICU state
Index: c/src/lib/libbsp/i386/pc386/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/pc386/ChangeLog,v
retrieving revision 1.214
diff -p -u -u -r1.214 ChangeLog
--- c/src/lib/libbsp/i386/pc386/ChangeLog	11 Feb 2009 19:48:24 -0000	1.214
+++ c/src/lib/libbsp/i386/pc386/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,15 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* Makefile.am: Add bspcmdline.c.
+	* include/bsp.h: Add boot command line interfaces.
+	* start/start.c: Save the multiboot command line. Pass the command
+	line to boot_card.
+	* start/start.S: Update for boot_card command line change.
+	* startup/bspstart.c: Initialise the command line.
+	* startup/bspcmdline.c: New.
+	* console/console.c, ide/idecfg.c: Add boot command line support.
+	* ide/ide.cfg: Add prints for errors to help resolve problems.
+
 2009-02-11	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* configure.ac, start/start16.S: Remove duplicate configure option and
Index: c/src/lib/libbsp/i386/pc386/Makefile.am
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/pc386/Makefile.am,v
retrieving revision 1.50
diff -p -u -u -r1.50 Makefile.am
--- c/src/lib/libbsp/i386/pc386/Makefile.am	2 Oct 2008 13:50:44 -0000	1.50
+++ c/src/lib/libbsp/i386/pc386/Makefile.am	24 Apr 2009 07:09:15 -0000
@@ -89,10 +89,10 @@ include_HEADERS += ../../i386/shared/com
 # startup
 libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/bsppredriverhook.c startup/bspgetworkarea.c \
-    ../../shared/bsppretaskinghook.c startup/bspstart.c \
+    ../../shared/bsppretaskinghook.c startup/bspstart.c startup/bspcmdline.c \
     ../../shared/bspclean.c startup/bspreset.c ../../i386/shared/irq/idt.c \
     ../../i386/shared/irq/irq.c ../../i386/shared/irq/irq_init.c \
-    ../../shared/bootcard.c ../../shared/sbrk.c \
+    ../../shared/bootcard.c ../../shared/bspinit.c ../../shared/sbrk.c \
     startup/ldsegs.S ../../i386/shared/irq/irq_asm.S
 
 # timer
Index: c/src/lib/libbsp/i386/pc386/console/console.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/pc386/console/console.c,v
retrieving revision 1.40
diff -p -u -u -r1.40 console.c
--- c/src/lib/libbsp/i386/pc386/console/console.c	3 Nov 2008 20:57:38 -0000	1.40
+++ c/src/lib/libbsp/i386/pc386/console/console.c	24 Apr 2009 07:09:15 -0000
@@ -149,7 +149,34 @@ console_initialize(rtems_device_major_nu
                    void                      *arg)
 {
   rtems_status_code status;
+  const char* mode;
+  
+  /*
+   * Check the command line for the type of mode
+   * the consol is.
+   */
+  mode = bsp_cmdline_arg ("--console=");
 
+  if (mode)
+  {
+    mode += sizeof ("--console=") - 1;
+    if (strncmp (mode, "console", sizeof ("console") - 1) == 0)
+    {
+      BSPConsolePort = BSP_CONSOLE_PORT_CONSOLE;
+      BSPPrintkPort  = BSP_CONSOLE_PORT_CONSOLE;
+    }
+    else if (strncmp (mode, "com1", sizeof ("com1") - 1) == 0)
+    {
+      BSPConsolePort = BSP_UART_COM1;
+      BSPPrintkPort  = BSP_UART_COM1;
+    }
+    else if (strncmp (mode, "com2", sizeof ("com2") - 1) == 0)
+    {
+      BSPConsolePort = BSP_UART_COM2;
+      BSPPrintkPort  = BSP_UART_COM2;
+    }
+  }
+  
   /* Initialize the KBD interface */
   kbd_init();
 
Index: c/src/lib/libbsp/i386/pc386/ide/ide.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/pc386/ide/ide.c,v
retrieving revision 1.10
diff -p -u -u -r1.10 ide.c
--- c/src/lib/libbsp/i386/pc386/ide/ide.c	6 Sep 2008 17:04:47 -0000	1.10
+++ c/src/lib/libbsp/i386/pc386/ide/ide.c	24 Apr 2009 07:09:15 -0000
@@ -30,6 +30,51 @@
 #include <libchip/ide_ctrl_io.h>
 
 /* #define DEBUG_OUT */
+
+static bool pc386_ide_status_busy (uint32_t port,
+                                   uint32_t timeout,
+                                   uint8_t* status_val)
+{
+  do
+  {
+    inport_byte (port + IDE_REGISTER_STATUS, *status_val);
+    if ((*status_val & IDE_REGISTER_STATUS_BSY) == 0)
+      return true;
+
+    if (timeout)
+    {
+      timeout--;
+      rtems_task_wake_after (TOD_MICROSECONDS_TO_TICKS (1000));
+    }
+  }
+  while (timeout);
+
+  return false;
+}
+
+static bool pc386_ide_status_data_ready (uint32_t port,
+                                         uint32_t timeout,
+                                         uint8_t* status_val)
+{
+  do
+  {
+    inport_byte (port + IDE_REGISTER_STATUS, *status_val);
+    
+    if (((*status_val & IDE_REGISTER_STATUS_BSY) == 0) &&
+        (*status_val & IDE_REGISTER_STATUS_DRQ))
+      return true;
+
+    if (timeout)
+    {
+      timeout--;
+      rtems_task_wake_after (TOD_MICROSECONDS_TO_TICKS (1000));
+    }
+  }
+  while (timeout);
+
+  return false;
+}
+
 /*
  * support functions for IDE harddisk IF
  */
@@ -174,18 +219,28 @@ void pc386_ide_read_block
   uint32_t    port = IDE_Controller_Table[minor].port1;
   uint16_t    cnt = 0;
   uint32_t    llength = bufs[(*cbuf)].length;
-  uint8_t   status_val;
+  uint8_t     status_val;
   uint16_t   *lbuf = (uint16_t*)
     ((uint8_t*)(bufs[(*cbuf)].buffer) + (*pos));
 
-  inport_byte(port+IDE_REGISTER_STATUS,status_val);
-  while ((status_val & IDE_REGISTER_STATUS_DRQ) &&
-	 (cnt < block_size)) {
+  while (cnt < block_size)
+  {
+    if (!pc386_ide_status_data_ready (port, 100, &status_val))
+    {
+      printk ("pc386_ide_read_block: status=%02x, cnt=%d bs=%d\n", status_val, cnt, block_size);
+      /* FIXME: add an error here. */
+      return;
+    }
+    
+    if (status_val & IDE_REGISTER_STATUS_ERR)
+      printk("pc386_ide_read_block: error: %02x\n", status_val);
+    
     inport_word(port+IDE_REGISTER_DATA,*lbuf);
 
 #ifdef DEBUG_OUT
     printk("0x%x ",*lbuf);
 #endif
+
     lbuf++;
     cnt    += sizeof(*lbuf);
     (*pos) += sizeof(*lbuf);
@@ -195,11 +250,7 @@ void pc386_ide_read_block
       lbuf = bufs[(*cbuf)].buffer;
       llength = bufs[(*cbuf)].length;
     }
-    inport_byte(port+IDE_REGISTER_STATUS,status_val);
   }
-#ifdef DEBUG_OUT
-  printk("pc386_ide_read_block()\r\n");
-#endif
 }
 
 /*=========================================================================*\
@@ -230,13 +281,23 @@ void pc386_ide_write_block
   uint8_t     status_val;
   uint16_t   *lbuf = (uint16_t*)
     ((uint8_t*)(bufs[(*cbuf)].buffer) + (*pos));
-
+  
 #ifdef DEBUG_OUT
-  printk("pc386_ide_write_block()\r\n");
+  printk("pc386_ide_write_block()\n");
 #endif
-  inport_byte(port+IDE_REGISTER_STATUS,status_val);
-  while ((status_val & IDE_REGISTER_STATUS_DRQ) &&
-	 (cnt < block_size)) {
+
+  while (cnt < block_size)
+  {
+    if (!pc386_ide_status_data_ready (port, 100, &status_val))
+    {
+      printk ("pc386_ide_write_block: status=%02x, cnt=%d bs=%d\n", status_val, cnt, block_size);
+      /* FIXME: add an error here. */
+      return;
+    }
+    
+    if (status_val & IDE_REGISTER_STATUS_ERR)
+      printk("pc386_ide_write_block: error: %02x\n", status_val);
+    
 #ifdef DEBUG_OUT
     printk("0x%x ",*lbuf);
 #endif
@@ -250,7 +311,6 @@ void pc386_ide_write_block
       lbuf = bufs[(*cbuf)].buffer;
       llength = bufs[(*cbuf)].length;
     }
-    inport_byte(port+IDE_REGISTER_STATUS,status_val);
   }
 }
 
Index: c/src/lib/libbsp/i386/pc386/ide/idecfg.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/pc386/ide/idecfg.c,v
retrieving revision 1.6
diff -p -u -u -r1.6 idecfg.c
--- c/src/lib/libbsp/i386/pc386/ide/idecfg.c	29 Sep 2005 08:05:32 -0000	1.6
+++ c/src/lib/libbsp/i386/pc386/ide/idecfg.c	24 Apr 2009 07:09:15 -0000
@@ -35,7 +35,6 @@ extern ide_ctrl_fns_t pc386_ide_ctrl_fns
 
 /* IDE controllers Table */
 ide_controller_bsp_table_t IDE_Controller_Table[] = {
-#if IDE_USE_PRIMARY_INTERFACE
   {"/dev/ide0",
    IDE_STD, /* standard IDE controller */
    &pc386_ide_ctrl_fns,
@@ -45,11 +44,7 @@ ide_controller_bsp_table_t IDE_Controlle
    FALSE,0, /* not (yet) interrupt driven */
    NULL
   }
-#if IDE_USE_SECONDARY_INTERFACE
   , /* colon only needed when both interfaces present */
-#endif
-#endif
-#if IDE_USE_SECONDARY_INTERFACE
   {"/dev/ide1",
    IDE_STD, /* standard IDE controller */
    &pc386_ide_ctrl_fns,
@@ -59,9 +54,74 @@ ide_controller_bsp_table_t IDE_Controlle
    FALSE,0, /* not (yet) interrupt driven */
    NULL
   }
-#endif
 };
 
-/* Number of rows in IDE_Controller_Table */
-unsigned long IDE_Controller_Count =
-   sizeof(IDE_Controller_Table)/sizeof(IDE_Controller_Table[0]);
+/* Number of rows in IDE_Controller_Table. Default is 0. */
+unsigned long IDE_Controller_Count;
+
+#if IDE_USE_PRIMARY_INTERFACE
+#define IDE1_DEFAULT true
+#else
+#define IDE1_DEFAULT false
+#endif
+#if IDE_USE_SECONDARY_INTERFACE
+#define IDE2_DEFAULT true
+#else
+#define IDE2_DEFAULT false
+#endif
+
+void bsp_ide_cmdline_init(void)
+{
+  bool ide1 = IDE1_DEFAULT;
+  bool ide2 = IDE2_DEFAULT;
+  const char* ide;
+  
+  /*
+   * Can have:
+   *  --ide=1,2
+   */
+  ide = bsp_cmdline_arg ("--ide=");
+  
+  if (ide)
+  {
+    int i;
+    /*
+     * If a command line option exists remove the defaults.
+     */
+    ide1 = ide2 = false;
+    
+    ide += sizeof ("--ide=") - 1;
+    
+    for (i = 0; i < 3; i++)
+    {
+      switch (ide[i])
+      {
+        case '1':
+          ide1 = true;
+          break;
+        case '2':
+          ide2 = true;
+          break;
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+        case ',':
+          break;
+        default:
+        break;
+      }
+    }
+  }
+
+  if (ide2 && !ide1)
+    IDE_Controller_Table[0] = IDE_Controller_Table[1];
+
+  if (ide1)
+    IDE_Controller_Count++;
+  if (ide2)
+    IDE_Controller_Count++;
+}
Index: c/src/lib/libbsp/i386/pc386/include/bsp.h
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/pc386/include/bsp.h,v
retrieving revision 1.40
diff -p -u -u -r1.40 bsp.h
--- c/src/lib/libbsp/i386/pc386/include/bsp.h	22 Sep 2008 21:49:43 -0000	1.40
+++ c/src/lib/libbsp/i386/pc386/include/bsp.h	24 Apr 2009 07:09:15 -0000
@@ -183,6 +183,17 @@ void Wait_X_ms(unsigned int timeToWait);
 #define BSP_CONSOLE_PORT_COM2    (BSP_UART_COM2)
 
 /*
+ * Command line.
+ */
+const char* bsp_cmdline(void);
+const char* bsp_cmdline_arg(const char* arg);
+
+/*
+ * IDE command line parsing.
+ */
+void bsp_ide_cmdline_init(void);
+
+/*
  * indicate, that BSP has IDE driver
  */
 #define RTEMS_BSP_HAS_IDE_DRIVER
Index: c/src/lib/libbsp/i386/pc386/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/pc386/start/start.S,v
retrieving revision 1.11
diff -p -u -u -r1.11 start.S
--- c/src/lib/libbsp/i386/pc386/start/start.S	22 Mar 2008 14:01:49 -0000	1.11
+++ c/src/lib/libbsp/i386/pc386/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -88,21 +88,42 @@ speakl:	jmp	speakl             # and SPI
         cli			# DISABLE INTERRUPTS!!!
 	cld
 
-		/* Save multiboot info */
-		cmp 	$0x2badb002,eax
-		jne		1f
-		/* We have multiboot info; let's hope DS and ES are OK... */
-		movl	ebx, SYM(_boot_multiboot_info_p)
-		/* Check for memory size info and save */
-		movl	ebx, esi
-		movl	$SYM(_boot_multiboot_info), edi
-		movsd
-		/* only save flag 1 since that's the only data we save */
-		and		$1,-4(edi)
-		je		1f
-		movl	$2,ecx
-		rep movsd
-1:
+	/* Save multiboot info if we detect a multiboot loader */
+	cmp 	$0x2badb002,eax
+	jne	2f
+	
+	/* We have multiboot info; let's hope DS and ES are OK... */
+	movl	ebx, SYM(_boot_multiboot_info_p)
+	/* Check for memory size info and save */
+	movl	ebx, esi
+	movl	(esi), eax
+	movl	eax, ebx
+	movl	$SYM(_boot_multiboot_info), edi
+ 	/* save flags, always present */
+	movsd
+	/* flag 1 is memory */
+	and	$1, eax
+	je	1f
+	movl	$2, ecx
+	rep movsd
+	/* flag 2 is the command line */
+1:	movl	ebx, eax
+	and	$4, eax
+	je	3f
+	movl    (_boot_multiboot_info_p), eax
+	movl    16(eax), esi
+	movl	$255, ecx
+2:	movzbl	(esi), eax
+	test	al, al
+	je	3f
+	movb	al, (edi)
+	inc	edi
+	inc	esi
+	dec	ecx
+	je	3f
+	jmp	2b
+3:	xor	al, al
+	movb	al, (edi)
 #ifdef DEBUG_EARLY_START
 	/*
 	 * Must get video attribute to have a working printk.
@@ -178,11 +199,10 @@ SYM (zero_bss):
 | Transfer control to User's Board Support Package
 +---------------------------------------------------------------------*/
 
-	pushl	$0			# environp
-	pushl	$0			# argv
-        pushl	$0			# argc
+	movl	$SYM(_boot_multiboot_cmdline), eax
+	pushl	eax			# cmdline
 	call	SYM (boot_card)
-	addl	$12, esp
+	addl	$4, esp
 
 /*---------------------------------------------------------------------+
 | Clean up - we do not know anything about it, so we will
@@ -199,11 +219,20 @@ SYM(_boot_multiboot_info_p):
 	.long 0
 
 	PUBLIC(_boot_multiboot_info)
+	PUBLIC(_boot_multiboot_flags)
+	PUBLIC(_boot_multiboot_memory)
+	PUBLIC(_boot_multiboot_cmdline)
 SYM(_boot_multiboot_info):
+SYM(_boot_multiboot_flags):
 	.long 0	/* flags */
+SYM(_boot_multiboot_memory):
 	.long 0 /* mem_lower */
 	.long 0 /* mem_upper */
-
+SYM(_boot_multiboot_cmdline):
+	.rept 256 /* cmd line */
+	.byte 0
+	.endr
+	
 	PUBLIC(_stack_size)
 SYM(_stack_size):
 	.long STACK_SIZE
Index: c/src/lib/libbsp/i386/pc386/startup/bspcmdline.c
===================================================================
RCS file: c/src/lib/libbsp/i386/pc386/startup/bspcmdline.c
diff -N c/src/lib/libbsp/i386/pc386/startup/bspcmdline.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ c/src/lib/libbsp/i386/pc386/startup/bspcmdline.c	24 Apr 2009 07:09:15 -0000
@@ -0,0 +1,62 @@
+/*-------------------------------------------------------------------------+
+| This file contains the PC386 BSP startup package. It includes application,
+| board, and monitor specific initialization and configuration. The generic CPU
+| dependent initialization has been performed before this routine is invoked.
++--------------------------------------------------------------------------+
+| (C) Copyright 2009 RTEMS Project
+|     Chris Johns (chrisj@rtems.org)
++--------------------------------------------------------------------------+
+| Disclaimer:
+|
+| This file is provided "AS IS" without warranty of any kind, either
+| expressed or implied.
++--------------------------------------------------------------------------+
+| This code is based on:
+|   common sense
+| With the following copyright notice:
+| **************************************************************************
+| *  COPYRIGHT (c) 1989-2008.
+| *  On-Line Applications Research Corporation (OAR).
+| *
+| *  The license and distribution terms for this file may be
+| *  found in found in the file LICENSE in this distribution or at
+| *  http://www.rtems.com/license/LICENSE.
+| **************************************************************************
+|
+|  $Id: bspstart.c,v 1.47 2008/09/18 20:41:09 joel Exp $
++--------------------------------------------------------------------------*/
+
+#include <bsp.h>
+#include <rtems/pci.h>
+#include <libcpu/cpuModel.h>
+
+/*
+ *  External data
+ */
+extern uint32_t _boot_multiboot_flags;
+extern uint32_t _boot_multiboot_memory[2];
+extern const char _boot_multiboot_cmdline[256];
+
+/*-------------------------------------------------------------------------+
+|         Function: bsp_cmdline
+|      Description: Call when you want the command line.
+| Global Variables: The multiboot values copied from the loader.
+|        Arguments: None.
+|          Returns: The whole command line.
++--------------------------------------------------------------------------*/
+const char* bsp_cmdline( void )
+{
+  return _boot_multiboot_cmdline;
+}
+
+/*-------------------------------------------------------------------------+
+|         Function: bsp_cmdline_arg
+|      Description: Call to search for an argument.
+| Global Variables: The multiboot values copied from the loader.
+|        Arguments: The option start.
+|          Returns: The option if found or nothing.
++--------------------------------------------------------------------------*/
+const char* bsp_cmdline_arg( const char* arg )
+{
+  return strstr (bsp_cmdline (), arg);
+}
Index: c/src/lib/libbsp/i386/pc386/startup/bspstart.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/pc386/startup/bspstart.c,v
retrieving revision 1.47
diff -p -u -u -r1.47 bspstart.c
--- c/src/lib/libbsp/i386/pc386/startup/bspstart.c	18 Sep 2008 20:41:09 -0000	1.47
+++ c/src/lib/libbsp/i386/pc386/startup/bspstart.c	24 Apr 2009 07:09:15 -0000
@@ -78,6 +78,9 @@ void bsp_start_default( void )
   if (pci_init_retval != PCIB_ERR_SUCCESS) {
       printk("PCI bus: could not initialize PCI BIOS interface\n");
   }
+
+  bsp_ide_cmdline_init ();
+
 } /* bsp_start */
 
 /*
Index: c/src/lib/libbsp/i386/ts_386ex/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/ts_386ex/ChangeLog,v
retrieving revision 1.123
diff -p -u -u -r1.123 ChangeLog
--- c/src/lib/libbsp/i386/ts_386ex/ChangeLog	4 Dec 2008 20:34:02 -0000	1.123
+++ c/src/lib/libbsp/i386/ts_386ex/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/i386/ts_386ex/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/ts_386ex/start/start.S,v
retrieving revision 1.7
diff -p -u -u -r1.7 start.S
--- c/src/lib/libbsp/i386/ts_386ex/start/start.S	21 Apr 2004 16:01:34 -0000	1.7
+++ c/src/lib/libbsp/i386/ts_386ex/start/start.S	24 Apr 2009 07:09:15 -0000
@@ -463,11 +463,9 @@ SYM (zero_bss):
 /*
  *  Transfer control to User's Board Support Package
  */
-        pushl   $0                       # environp
-        pushl   $0                       # argv
-        pushl   $0                       # argc
+        pushl   $0                       # command line
 	call SYM(boot_card)
-        addl    $12,esp
+        addl    $4,esp
 
 	LED_RED                          # Indicate RTEMS exited
 /*
Index: c/src/lib/libbsp/lm32/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/lm32/ChangeLog,v
retrieving revision 1.5
diff -p -u -u -r1.5 ChangeLog
--- c/src/lib/libbsp/lm32/ChangeLog	6 Apr 2009 21:33:48 -0000	1.5
+++ c/src/lib/libbsp/lm32/ChangeLog	24 Apr 2009 07:09:15 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* shared/start/start.S: Update for boot_card command line change.
+
 2009-04-06	Michael Walle <michael@walle.cc>
 
 	* shared/start/start.S: Now calls boot_card.
Index: c/src/lib/libbsp/lm32/shared/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/lm32/shared/start/start.S,v
retrieving revision 1.3
diff -p -u -u -r1.3 start.S
--- c/src/lib/libbsp/lm32/shared/start/start.S	6 Apr 2009 21:33:48 -0000	1.3
+++ c/src/lib/libbsp/lm32/shared/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -13,6 +13,11 @@
  *  Micro-Research Finland Oy
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #include "bspopts.h"
 
      .section .boot,"a",@progbits
@@ -143,8 +148,6 @@ crt0:	
 	bi	.clear_bss
 .end_clear_bss:
 	mvi	r1, 0
-	mvi	r2, 0
-	mvi	r3, 0
 	mvhi	r7, hi(boot_card)
 	ori	r7, r7, lo(boot_card)
 	call	r7
Index: c/src/lib/libbsp/m32c/m32cbsp/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m32c/m32cbsp/ChangeLog,v
retrieving revision 1.3
diff -p -u -u -r1.3 ChangeLog
--- c/src/lib/libbsp/m32c/m32cbsp/ChangeLog	4 Dec 2008 20:32:10 -0000	1.3
+++ c/src/lib/libbsp/m32c/m32cbsp/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs, tools/runtest.in: Move -e start from *link to *startfile
Index: c/src/lib/libbsp/m32c/m32cbsp/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m32c/m32cbsp/start/start.S,v
retrieving revision 1.1
diff -p -u -u -r1.1 start.S
--- c/src/lib/libbsp/m32c/m32cbsp/start/start.S	2 Oct 2008 21:34:35 -0000	1.1
+++ c/src/lib/libbsp/m32c/m32cbsp/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -30,6 +30,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
 
 */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these errors.
+	
 #if defined(__r8c_cpu__) || defined(__m16c_cpu__)
 #define A16
 #define A(n,w) n
Index: c/src/lib/libbsp/m32r/m32rsim/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m32r/m32rsim/ChangeLog,v
retrieving revision 1.2
diff -p -u -u -r1.2 ChangeLog
--- c/src/lib/libbsp/m32r/m32rsim/ChangeLog	4 Dec 2008 20:32:15 -0000	1.2
+++ c/src/lib/libbsp/m32r/m32rsim/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m32r/m32rsim/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m32r/m32rsim/start/start.S,v
retrieving revision 1.1
diff -p -u -u -r1.1 start.S
--- c/src/lib/libbsp/m32r/m32rsim/start/start.S	2 Oct 2008 21:56:30 -0000	1.1
+++ c/src/lib/libbsp/m32r/m32rsim/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -4,6 +4,11 @@
  *  $Id: start.S,v 1.1 2008/10/02 21:56:30 joel Exp $
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+
 	.text
 	.balign 4
 	.global	_start
Index: c/src/lib/libbsp/m68k/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/ChangeLog,v
retrieving revision 1.52
diff -p -u -u -r1.52 ChangeLog
--- c/src/lib/libbsp/m68k/ChangeLog	16 Sep 2008 22:16:29 -0000	1.52
+++ c/src/lib/libbsp/m68k/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* shared/start/start.S: Update for boot_card command line change.
+
 2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* shared/m68kbspgetworkarea.c: Removed.
Index: c/src/lib/libbsp/m68k/av5282/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/av5282/ChangeLog,v
retrieving revision 1.46
diff -p -u -u -r1.46 ChangeLog
--- c/src/lib/libbsp/m68k/av5282/ChangeLog	21 Jan 2009 18:17:46 -0000	1.46
+++ c/src/lib/libbsp/m68k/av5282/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-01-21	Frank Ueberschar <frank.ueberschar@dsa-volgmann.de>
 
 	PR 1354/bsps
Index: c/src/lib/libbsp/m68k/av5282/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/av5282/start/start.S,v
retrieving revision 1.2
diff -p -u -u -r1.2 start.S
--- c/src/lib/libbsp/m68k/av5282/start/start.S	12 Mar 2007 11:18:14 -0000	1.2
+++ c/src/lib/libbsp/m68k/av5282/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -370,13 +370,9 @@ ZEROLOOPTEST:
      * Right : Now we're ready to boot RTEMS
      */
     clrl    d0          | Pass in null to all boot_card() params
-    movel   d0,a7@-         | environp
-    movel   d0,a7@-         | argv
-    movel   d0,a7@-         | argc
+    movel   d0,a7@-         | command line
     jsr SYM(boot_card)      | Call C boot_card function to startup RTEMS
-        movel   a7@+,d0
-        movel   a7@+,d0
-        movel   a7@+,d0
+    movel   a7@+,d0
 MULTI_TASK_EXIT:
         nop
         nop
Index: c/src/lib/libbsp/m68k/csb360/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/csb360/ChangeLog,v
retrieving revision 1.42
diff -p -u -u -r1.42 ChangeLog
--- c/src/lib/libbsp/m68k/csb360/ChangeLog	4 Dec 2008 20:30:44 -0000	1.42
+++ c/src/lib/libbsp/m68k/csb360/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/csb360/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/csb360/start/start.S,v
retrieving revision 1.4
diff -p -u -u -r1.4 start.S
--- c/src/lib/libbsp/m68k/csb360/start/start.S	12 Mar 2007 11:18:16 -0000	1.4
+++ c/src/lib/libbsp/m68k/csb360/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -351,9 +351,7 @@ SYM(start_csb360):
 	 * Right : Now we're ready to boot RTEMS
 	 */
 	clrl	d0			| Pass in null to all boot_card() params
- 	movel	d0,a7@-			| environp
-	movel	d0,a7@-			| argv
-	movel	d0,a7@-			| argc
+	movel	d0,a7@-			| command line
 	jsr	SYM(boot_card)		| Call C boot_card function to startup RTEMS
 
 
Index: c/src/lib/libbsp/m68k/gen68302/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/gen68302/ChangeLog,v
retrieving revision 1.111
diff -p -u -u -r1.111 ChangeLog
--- c/src/lib/libbsp/m68k/gen68302/ChangeLog	4 Dec 2008 20:30:45 -0000	1.111
+++ c/src/lib/libbsp/m68k/gen68302/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/gen68302/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/gen68302/start/start.S,v
retrieving revision 1.8
diff -p -u -u -r1.8 start.S
--- c/src/lib/libbsp/m68k/gen68302/start/start.S	21 Apr 2004 16:01:34 -0000	1.8
+++ c/src/lib/libbsp/m68k/gen68302/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -220,9 +220,7 @@ loop:   movel   d0,a1@+                |
         movec   a0,isp                | set interrupt stack
 #endif
 
-        move.l  #0,a7@-               | environp
-        move.l  #0,a7@-               | argv
-        move.l  #0,a7@-               | argc
+        move.l  #0,a7@-               | command line
         jsr     SYM (boot_card)
 
 	nop
Index: c/src/lib/libbsp/m68k/gen68340/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/gen68340/ChangeLog,v
retrieving revision 1.114
diff -p -u -u -r1.114 ChangeLog
--- c/src/lib/libbsp/m68k/gen68340/ChangeLog	27 Feb 2009 19:19:46 -0000	1.114
+++ c/src/lib/libbsp/m68k/gen68340/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-02-27	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am: Remove unnecessary copy of cpu_asm.S
Index: c/src/lib/libbsp/m68k/gen68340/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/gen68340/start/start.S,v
retrieving revision 1.13
diff -p -u -u -r1.13 start.S
--- c/src/lib/libbsp/m68k/gen68340/start/start.S	17 Oct 2006 02:35:11 -0000	1.13
+++ c/src/lib/libbsp/m68k/gen68340/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -848,9 +848,7 @@ ZEROLOOPTEST:
 	bcs.s	ZEROLOOP					| No, skip
 
 	movel	#_stack_init,a7					| set master stack pointer
-	movel	d0,a7@-						| environp
-	movel	d0,a7@-						| argv
-	movel	d0,a7@-						| argc
+	movel	d0,a7@-						| command line
 	jsr	SYM(boot_card)					| Call C main
 
 	PUBLIC (_mainDone)
Index: c/src/lib/libbsp/m68k/gen68360/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/gen68360/ChangeLog,v
retrieving revision 1.121
diff -p -u -u -r1.121 ChangeLog
--- c/src/lib/libbsp/m68k/gen68360/ChangeLog	4 Dec 2008 20:30:47 -0000	1.121
+++ c/src/lib/libbsp/m68k/gen68360/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/gen68360/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/gen68360/start/start.S,v
retrieving revision 1.11
diff -p -u -u -r1.11 start.S
--- c/src/lib/libbsp/m68k/gen68360/start/start.S	16 Sep 2008 19:03:17 -0000	1.11
+++ c/src/lib/libbsp/m68k/gen68360/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -393,9 +393,7 @@ ZEROLOOPTEST:
 	bcs.s	ZEROLOOP		| No, skip
 
 	movel	#_stack_init,a7		| set master stack pointer
-	pea	env			| envp
-	pea	arg			| argv
-	movel	d0,a7@-			| argc
+	movel	d0,a7@-			| command line
 	jsr	boot_card		| Call C main
 
 	PUBLIC (_mainDone)
@@ -413,15 +411,10 @@ BEGIN_DATA_DCL
         .align 2
 	PUBLIC (environ)
 environ:
-	.long	env
+	.long	0
 	PUBLIC (_M68kSpuriousInterruptCount)
 _M68kSpuriousInterruptCount:
 	.long	0
 END_DATA_DCL
 
-BEGIN_BSS
-env:	.long	0
-arg:	.long	0
-END_BSS
-
 END
Index: c/src/lib/libbsp/m68k/genmcf548x/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog,v
retrieving revision 1.25
diff -p -u -u -r1.25 ChangeLog
--- c/src/lib/libbsp/m68k/genmcf548x/ChangeLog	4 Dec 2008 20:30:48 -0000	1.25
+++ c/src/lib/libbsp/m68k/genmcf548x/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/genmcf548x/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/genmcf548x/start/start.S,v
retrieving revision 1.1
diff -p -u -u -r1.1 start.S
--- c/src/lib/libbsp/m68k/genmcf548x/start/start.S	11 Jul 2008 10:00:41 -0000	1.1
+++ c/src/lib/libbsp/m68k/genmcf548x/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -414,15 +414,11 @@ SYM(start_init):
     move.l  #_SpInit,sp		        /* relocate sp */ 
      
     clrl    d0          		/* clear d0 */
-    movel   d0,a7@-                     /* environp == NULL */
-    movel   d0,a7@-                     /* argv == NULL */
-    movel   d0,a7@-                     /* argc == 0 */
+    movel   d0,a7@-                     /* command line == 0 */
  
     jsr     boot_card                   /* boot rtems */
 
     movel   a7@+,d0
-    movel   a7@+,d0
-    movel   a7@+,d0
 
 exit_multitasking:
     nop
Index: c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog,v
retrieving revision 1.100
diff -p -u -u -r1.100 ChangeLog
--- c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog	4 Dec 2008 20:30:50 -0000	1.100
+++ c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* startup/init52235.c: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/mcf5206elite/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S,v
retrieving revision 1.8
diff -p -u -u -r1.8 start.S
--- c/src/lib/libbsp/m68k/mcf5206elite/start/start.S	16 Sep 2008 19:03:23 -0000	1.8
+++ c/src/lib/libbsp/m68k/mcf5206elite/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -357,9 +357,7 @@ ZEROLOOPTEST:
 	 * Right : Now we're ready to boot RTEMS
 	 */
 	clrl	d0			| Pass in null to all boot_card() params
- 	movel	d0,a7@-			| environp
-	movel	d0,a7@-			| argv
-	movel	d0,a7@-			| argc
+	movel	d0,a7@-			| command line
 	jsr	SYM(boot_card)		| Call C boot_card function to startup RTEMS
 
 # Wait forever
Index: c/src/lib/libbsp/m68k/mcf52235/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mcf52235/ChangeLog,v
retrieving revision 1.23
diff -p -u -u -r1.23 ChangeLog
--- c/src/lib/libbsp/m68k/mcf52235/ChangeLog	4 Dec 2008 20:30:51 -0000	1.23
+++ c/src/lib/libbsp/m68k/mcf52235/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c,v
retrieving revision 1.3
diff -p -u -u -r1.3 init52235.c
--- c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c	19 Aug 2008 11:14:43 -0000	1.3
+++ c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c	24 Apr 2009 07:09:16 -0000
@@ -8,7 +8,7 @@
 
 extern void _wr_vbr(uint32_t);
 extern void init_main(void);
-extern int boot_card(int, char **, char **);
+extern int boot_card(const char *);
 
 /*
  * From linkcmds
@@ -76,6 +76,6 @@ void Init52235(void)
    * We have to call some kind of RTEMS function here!
    */
 
-  boot_card(0, 0, 0);
+  boot_card(0);
   for (;;) ;
-}
\ No newline at end of file
+}
Index: c/src/lib/libbsp/m68k/mcf5235/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mcf5235/ChangeLog,v
retrieving revision 1.49
diff -p -u -u -r1.49 ChangeLog
--- c/src/lib/libbsp/m68k/mcf5235/ChangeLog	4 Dec 2008 20:30:52 -0000	1.49
+++ c/src/lib/libbsp/m68k/mcf5235/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/mcf5235/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mcf5235/start/start.S,v
retrieving revision 1.3
diff -p -u -u -r1.3 start.S
--- c/src/lib/libbsp/m68k/mcf5235/start/start.S	11 Jun 2008 08:03:50 -0000	1.3
+++ c/src/lib/libbsp/m68k/mcf5235/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -368,13 +368,9 @@ ZEROLOOPTEST:
      * Right : Now we're ready to boot RTEMS
      */
     clrl    d0          | Pass in null to all boot_card() params
-    movel   d0,a7@-         | environp
-    movel   d0,a7@-         | argv
-    movel   d0,a7@-         | argc
+    movel   d0,a7@-         | command line
     jsr SYM(boot_card)      | Call C boot_card function to startup RTEMS
         movel   a7@+,d0
-        movel   a7@+,d0
-        movel   a7@+,d0
 MULTI_TASK_EXIT:
         nop
         nop
Index: c/src/lib/libbsp/m68k/mcf5329/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mcf5329/ChangeLog,v
retrieving revision 1.22
diff -p -u -u -r1.22 ChangeLog
--- c/src/lib/libbsp/m68k/mcf5329/ChangeLog	4 Dec 2008 20:30:54 -0000	1.22
+++ c/src/lib/libbsp/m68k/mcf5329/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* startup/init5329.c: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c,v
retrieving revision 1.2
diff -p -u -u -r1.2 init5329.c
--- c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c	19 Aug 2008 11:19:19 -0000	1.2
+++ c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c	24 Apr 2009 07:09:16 -0000
@@ -9,7 +9,7 @@
 
 extern void _wr_vbr(uint32_t);
 extern void init_main(void);
-extern int boot_card(int, char **, char **);
+extern int boot_card(const char *);
 
 /*
  * From linkcmds
@@ -77,6 +77,6 @@ void Init5329(void)
    * We have to call some kind of RTEMS function here!
    */
 
-  boot_card(0, 0, 0);
+  boot_card(0);
   for (;;) ;
 }
Index: c/src/lib/libbsp/m68k/mrm332/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mrm332/ChangeLog,v
retrieving revision 1.115
diff -p -u -u -r1.115 ChangeLog
--- c/src/lib/libbsp/m68k/mrm332/ChangeLog	4 Dec 2008 20:30:55 -0000	1.115
+++ c/src/lib/libbsp/m68k/mrm332/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,8 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S, startup/start_c.c: Update for boot_card command
+	line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/mrm332/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mrm332/start/start.S,v
retrieving revision 1.5
diff -p -u -u -r1.5 start.S
--- c/src/lib/libbsp/m68k/mrm332/start/start.S	21 Apr 2004 16:01:35 -0000	1.5
+++ c/src/lib/libbsp/m68k/mrm332/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -142,7 +142,7 @@ END_CODE
   /*
    * Execute main with arguments argc and agrv.
    */
-  boot_card(1,__argv);
+  boot_card((void*)0);
   reboot();
 
 }
Index: c/src/lib/libbsp/m68k/mrm332/startup/start_c.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c,v
retrieving revision 1.7
diff -p -u -u -r1.7 start_c.c
--- c/src/lib/libbsp/m68k/mrm332/startup/start_c.c	19 Aug 2008 10:23:15 -0000	1.7
+++ c/src/lib/libbsp/m68k/mrm332/startup/start_c.c	24 Apr 2009 07:09:16 -0000
@@ -9,9 +9,8 @@
 
 m68k_isr_entry M68Kvec[256];
 m68k_isr_entry vectors[256];
-char * const __argv[]= {"main", ""};
 
-void  boot_card(int argc, char * const argv[]);
+void  boot_card(const char *cmdline);
 
 /*
  *  This prototype really should have the noreturn attribute but
@@ -119,7 +118,7 @@ void start_c(void) {
   /*
    * Execute main with arguments argc and agrv.
    */
-  boot_card(1,__argv);
+  boot_card((void*)0);
   reboot();
 
 }
Index: c/src/lib/libbsp/m68k/ods68302/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/ods68302/ChangeLog,v
retrieving revision 1.118
diff -p -u -u -r1.118 ChangeLog
--- c/src/lib/libbsp/m68k/ods68302/ChangeLog	4 Dec 2008 20:31:06 -0000	1.118
+++ c/src/lib/libbsp/m68k/ods68302/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* startup/cpuboot.c: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c,v
retrieving revision 1.9
diff -p -u -u -r1.9 cpuboot.c
--- c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c	19 Aug 2008 09:15:36 -0000	1.9
+++ c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c	24 Apr 2009 07:09:16 -0000
@@ -119,7 +119,7 @@ void boot_phase_2(void)
   static constructors have not been called, and RTEMS is not initialised.
   */
 
-void boot_card(void);
+void boot_card(const char* cmdline);
 void set_debug_traps(void);
 void breakpoint(void);
 
@@ -136,7 +136,7 @@ void boot_phase_3(void)
   /* FIXME : add RAM and ROM checks */
 
   /* boot the bsp, what ever this means */
-  boot_card();
+  boot_card((void*)0);
 
   WATCHDOG_TRIGGER();
 }
Index: c/src/lib/libbsp/m68k/shared/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/shared/start.S,v
retrieving revision 1.9
diff -p -u -u -r1.9 start.S
--- c/src/lib/libbsp/m68k/shared/start.S	15 Apr 2004 13:26:15 -0000	1.9
+++ c/src/lib/libbsp/m68k/shared/start.S	24 Apr 2009 07:09:16 -0000
@@ -91,9 +91,7 @@ loop:   movel   #0,a1@+                 
         lea     SYM (hiintstack),a0   | a0 = high end of intr stack
         movec   a0,isp                | set interrupt stack
 #endif
-        pea	env                   | push environp
-        pea	arg                   | push argv
-        movel   #0,a7@-               | push argc
+        movel   #0,a7@-               | push command line
 
         jsr     SYM (boot_card)
         addl    #12,a7
@@ -118,7 +116,7 @@ BEGIN_DATA
 	PUBLIC (environ)
         .align 2
 SYM (environ):
-	.long	env
+	.long	0
 
 	PUBLIC (start_frame)
 SYM (start_frame):
@@ -128,9 +126,6 @@ END_DATA
 
 BEGIN_BSS
 
-env: .long  0
-arg: .long  0
-
 	PUBLIC (initial_isp)
 SYM (initial_isp):
         .space  4
Index: c/src/lib/libbsp/m68k/sim68000/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/sim68000/ChangeLog,v
retrieving revision 1.103
diff -p -u -u -r1.103 ChangeLog
--- c/src/lib/libbsp/m68k/sim68000/ChangeLog	4 Dec 2008 20:31:08 -0000	1.103
+++ c/src/lib/libbsp/m68k/sim68000/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/m68k/sim68000/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/sim68000/start/start.S,v
retrieving revision 1.9
diff -p -u -u -r1.9 start.S
--- c/src/lib/libbsp/m68k/sim68000/start/start.S	21 Apr 2004 16:01:36 -0000	1.9
+++ c/src/lib/libbsp/m68k/sim68000/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -381,8 +381,6 @@ zerobss_loop:
         movel   %d0,%a7                         | set master stack pointer
         movel   %d0,%a6                         | set base pointer
 
-	pea	env				| push environp
-	pea	arg				| push argv
 	movel	#0,%a7@-			| push argc
         jsr     boot_card
 	| if this returns, what do we do???
@@ -403,11 +401,8 @@ bsp_exitted:
 
         .sect   .bss
 
-env: .long  0
-arg: .long  0
-
         .global environ
         .align  2
 
 environ:
-        .long   env
+        .long   0
Index: c/src/lib/libbsp/m68k/uC5282/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/uC5282/ChangeLog,v
retrieving revision 1.94
diff -p -u -u -r1.94 ChangeLog
--- c/src/lib/libbsp/m68k/uC5282/ChangeLog	2 Mar 2009 18:57:11 -0000	1.94
+++ c/src/lib/libbsp/m68k/uC5282/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-03-02	Till Straumann <strauman@slac.stanford.edu>
 
 	PR 1375/bsps
Index: c/src/lib/libbsp/m68k/uC5282/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/uC5282/start/start.S,v
retrieving revision 1.4
diff -p -u -u -r1.4 start.S
--- c/src/lib/libbsp/m68k/uC5282/start/start.S	12 Mar 2007 11:18:23 -0000	1.4
+++ c/src/lib/libbsp/m68k/uC5282/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -382,13 +382,9 @@ ZEROLOOPTEST:
      * Right : Now we're ready to boot RTEMS
      */
     clrl    d0          | Pass in null to all boot_card() params
-    movel   d0,a7@-         | environp
-    movel   d0,a7@-         | argv
-    movel   d0,a7@-         | argc
+    movel   d0,a7@-         | command line
     jsr SYM(boot_card)      | Call C boot_card function to startup RTEMS
         movel   a7@+,d0
-        movel   a7@+,d0
-        movel   a7@+,d0
 MULTI_TASK_EXIT:
         nop
         nop
Index: c/src/lib/libbsp/mips/csb350/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/csb350/ChangeLog,v
retrieving revision 1.50
diff -p -u -u -r1.50 ChangeLog
--- c/src/lib/libbsp/mips/csb350/ChangeLog	11 Feb 2009 19:49:34 -0000	1.50
+++ c/src/lib/libbsp/mips/csb350/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-02-11	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* startup/linkcmds: It appears 16 MB is the configuration.
Index: c/src/lib/libbsp/mips/csb350/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/csb350/start/start.S,v
retrieving revision 1.3
diff -p -u -u -r1.3 start.S
--- c/src/lib/libbsp/mips/csb350/start/start.S	29 Sep 2008 13:09:43 -0000	1.3
+++ c/src/lib/libbsp/mips/csb350/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -89,7 +89,7 @@ zerobss:
 	.ent	init
 init:
 
-	move	a0,zero			/* set argc to 0 */
+	move	a0,zero			/* set command line to 0 */
 	jal	boot_card		/* call the program start function */
 	nop
 
Index: c/src/lib/libbsp/mips/genmongoosev/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/genmongoosev/ChangeLog,v
retrieving revision 1.118
diff -p -u -u -r1.118 ChangeLog
--- c/src/lib/libbsp/mips/genmongoosev/ChangeLog	4 Dec 2008 20:31:19 -0000	1.118
+++ c/src/lib/libbsp/mips/genmongoosev/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/mips/genmongoosev/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/genmongoosev/start/start.S,v
retrieving revision 1.14
diff -p -u -u -r1.14 start.S
--- c/src/lib/libbsp/mips/genmongoosev/start/start.S	29 Sep 2008 13:09:46 -0000	1.14
+++ c/src/lib/libbsp/mips/genmongoosev/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -413,7 +413,7 @@ _initialize_rtems:
    sw		k1,0(a0)
    nop
 
-   move		a0,zero         /* set argc to 0 */
+   move		a0,zero         /* set command line to 0 */
    jal		boot_card           /* call the program start function */
    nop
 
Index: c/src/lib/libbsp/mips/hurricane/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/hurricane/ChangeLog,v
retrieving revision 1.41
diff -p -u -u -r1.41 ChangeLog
--- c/src/lib/libbsp/mips/hurricane/ChangeLog	12 Mar 2009 14:18:17 -0000	1.41
+++ c/src/lib/libbsp/mips/hurricane/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-03-12	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1385/cpukit
Index: c/src/lib/libbsp/mips/hurricane/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/hurricane/start/start.S,v
retrieving revision 1.4
diff -p -u -u -r1.4 start.S
--- c/src/lib/libbsp/mips/hurricane/start/start.S	25 Sep 2008 13:35:04 -0000	1.4
+++ c/src/lib/libbsp/mips/hurricane/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -294,8 +294,7 @@ FRAME(start,sp,0,ra)
 /***********************  END I/O initialization **********************/
 
 
-	move	a0,zero		/* Set argc passed to main */
-	move	a1,zero		/* Set argv passed to main */
+	move	a0,zero		/* Set command line passed to main */
 	jal	boot_card
 	nop
 
Index: c/src/lib/libbsp/mips/jmr3904/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/jmr3904/ChangeLog,v
retrieving revision 1.114
diff -p -u -u -r1.114 ChangeLog
--- c/src/lib/libbsp/mips/jmr3904/ChangeLog	4 Dec 2008 20:31:21 -0000	1.114
+++ c/src/lib/libbsp/mips/jmr3904/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/mips/jmr3904/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/jmr3904/start/start.S,v
retrieving revision 1.8
diff -p -u -u -r1.8 start.S
--- c/src/lib/libbsp/mips/jmr3904/start/start.S	29 Sep 2008 13:09:50 -0000	1.8
+++ c/src/lib/libbsp/mips/jmr3904/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -159,7 +159,7 @@ zerobss:
 	.ent	init
 init:
 
-	move	a0,zero				# set argc to 0
+	move	a0,zero				# set command line to 0
 	jal	boot_card			# call the program start function
 	nop
 
Index: c/src/lib/libbsp/mips/rbtx4925/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/rbtx4925/ChangeLog,v
retrieving revision 1.35
diff -p -u -u -r1.35 ChangeLog
--- c/src/lib/libbsp/mips/rbtx4925/ChangeLog	12 Mar 2009 14:18:19 -0000	1.35
+++ c/src/lib/libbsp/mips/rbtx4925/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-03-12	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1385/cpukit
Index: c/src/lib/libbsp/mips/rbtx4925/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/rbtx4925/start/start.S,v
retrieving revision 1.1
diff -p -u -u -r1.1 start.S
--- c/src/lib/libbsp/mips/rbtx4925/start/start.S	16 Mar 2006 17:34:05 -0000	1.1
+++ c/src/lib/libbsp/mips/rbtx4925/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -35,6 +35,10 @@ LICENSED MATERIAL - PROGRAM PROPERTY OF 
 #include <rtems/mips/idtcpu.h>
 #include <rtems/asm.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning Please check and remove these warnings.
+	
 	.extern	mon_flush_cache		
 
 #if 0	
@@ -317,7 +321,6 @@ FRAME(start,sp,0,ra)
 ** End of CPU initialization, ready to start kernel
 */
 	move	a0,zero		/* Set argc passed to main */
-	move	a1,zero		/* Set argv passed to main */
 	jal	boot_card
 	nop
 
Index: c/src/lib/libbsp/mips/rbtx4938/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/rbtx4938/ChangeLog,v
retrieving revision 1.36
diff -p -u -u -r1.36 ChangeLog
--- c/src/lib/libbsp/mips/rbtx4938/ChangeLog	12 Mar 2009 14:18:21 -0000	1.36
+++ c/src/lib/libbsp/mips/rbtx4938/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-03-12	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1385/cpukit
Index: c/src/lib/libbsp/mips/rbtx4938/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/mips/rbtx4938/start/start.S,v
retrieving revision 1.1
diff -p -u -u -r1.1 start.S
--- c/src/lib/libbsp/mips/rbtx4938/start/start.S	16 Mar 2006 17:41:28 -0000	1.1
+++ c/src/lib/libbsp/mips/rbtx4938/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -35,6 +35,10 @@ LICENSED MATERIAL - PROGRAM PROPERTY OF 
 #include <rtems/mips/idtcpu.h>
 #include <rtems/asm.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning Please check and remove these warnings.
+
 /* The following include file was deprecated */
 /* #include <idtmon.h>	*/
 
@@ -318,8 +322,7 @@ FRAME(start,sp,0,ra)
 /*
 ** End of CPU initialization, ready to start kernel
 */
-	move	a0,zero		/* Set argc passed to main */
-	move	a1,zero		/* Set argv passed to main */
+	move	a0,zero		/* Set command line passed to boot_card */
 	jal	boot_card
 	nop
 
Index: c/src/lib/libbsp/powerpc/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/ChangeLog,v
retrieving revision 1.197
diff -p -u -u -r1.197 ChangeLog
--- c/src/lib/libbsp/powerpc/ChangeLog	12 Mar 2009 14:18:32 -0000	1.197
+++ c/src/lib/libbsp/powerpc/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* shared/start/start.S: Update for boot_card command line change.
+
 2009-03-12	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1385/cpukit
Index: c/src/lib/libbsp/powerpc/ep1a/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog,v
retrieving revision 1.69
diff -p -u -u -r1.69 ChangeLog
--- c/src/lib/libbsp/powerpc/ep1a/ChangeLog	7 Dec 2008 04:30:57 -0000	1.69
+++ c/src/lib/libbsp/powerpc/ep1a/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-07	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bsp_specs: Remove -Qy from *link.
Index: c/src/lib/libbsp/powerpc/ep1a/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/ep1a/start/start.S,v
retrieving revision 1.2
diff -p -u -u -r1.2 start.S
--- c/src/lib/libbsp/powerpc/ep1a/start/start.S	29 Apr 2005 13:50:05 -0000	1.2
+++ c/src/lib/libbsp/powerpc/ep1a/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -36,6 +36,11 @@
 #include <bsp.h>
 */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include <libcpu/io.h>
@@ -120,10 +125,7 @@ __rtems_entry_point:
 	stw	r0,0(sp)		/* clear back chain */
 	stwu	sp,-56(sp)		/* push another stack frame */
 
-        lis	r5,environ@ha
-        la	r5,environ@l(r5)	/* environp */
-	li	r4, 0			/* argv */
-	li	r3, 0			/* argc */
+	li	r3, 0			/* command line */
 
 	/* Let her rip */
 	bl	FUNC_NAME(boot_card)
Index: c/src/lib/libbsp/powerpc/gen5200/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/gen5200/ChangeLog,v
retrieving revision 1.117
diff -p -u -u -r1.117 ChangeLog
--- c/src/lib/libbsp/powerpc/gen5200/ChangeLog	27 Feb 2009 11:25:30 -0000	1.117
+++ c/src/lib/libbsp/powerpc/gen5200/ChangeLog	24 Apr 2009 07:09:16 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-02-27	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* bsp_specs: Added crtbegin.o and crtend.o to support global C++
Index: c/src/lib/libbsp/powerpc/gen5200/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/gen5200/start/start.S,v
retrieving revision 1.8
diff -p -u -u -r1.8 start.S
--- c/src/lib/libbsp/powerpc/gen5200/start/start.S	20 Sep 2008 21:39:02 -0000	1.8
+++ c/src/lib/libbsp/powerpc/gen5200/start/start.S	24 Apr 2009 07:09:16 -0000
@@ -89,7 +89,12 @@
 /*   Version history:  1.0                                             */
 /*                                                                     */
 /***********************************************************************/
-   
+
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #include <rtems/powerpc/cache.h>
 
 #include <bsp.h>
@@ -420,10 +425,8 @@ skip_ROM_start:
 
 /* clear arguments and do further init. in C (common for RAM/ROM startup) */
 
-        /* Clear argc, argv and envp */
+        /* Clear cmdline */
         xor r3, r3, r3
-        xor r4, r4, r4
-        xor r5, r5, r5
         
         bl      SYM (boot_card)			/* Call the first C routine */
 
Index: c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog,v
retrieving revision 1.78
diff -p -u -u -r1.78 ChangeLog
--- c/src/lib/libbsp/powerpc/gen83xx/ChangeLog	19 Mar 2009 10:49:55 -0000	1.78
+++ c/src/lib/libbsp/powerpc/gen83xx/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-03-18	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* start/start.S, include/hwreg_vals.h, startup/cpuinit.c:
Index: c/src/lib/libbsp/powerpc/gen83xx/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/gen83xx/start/start.S,v
retrieving revision 1.7
diff -p -u -u -r1.7 start.S
--- c/src/lib/libbsp/powerpc/gen83xx/start/start.S	19 Mar 2009 10:49:55 -0000	1.7
+++ c/src/lib/libbsp/powerpc/gen83xx/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -18,6 +18,12 @@
 \*===============================================================*/
 /* $Id: start.S,v 1.7 2009/03/19 10:49:55 thomas Exp $ */   
 
+
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #include <libcpu/powerpc-utility.h> 
 #include <rtems/powerpc/cache.h>
 #include <bsp.h>
@@ -446,10 +452,8 @@ start_code_in_ram:	
 
 /* clear arguments and do further init. in C (common for RAM/ROM startup) */
 
-        /* Clear argc, argv and envp */
+        /* Clear cmdline */
         xor r3, r3, r3
-        xor r4, r4, r4
-        xor r5, r5, r5
 
         bl      SYM (boot_card)  /* Call the first C routine */
 	
Index: c/src/lib/libbsp/powerpc/haleakala/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/haleakala/ChangeLog,v
retrieving revision 1.19
diff -p -u -u -r1.19 ChangeLog
--- c/src/lib/libbsp/powerpc/haleakala/ChangeLog	18 Dec 2008 18:51:28 -0000	1.19
+++ c/src/lib/libbsp/powerpc/haleakala/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* dlentry/dlentry.S: Update for boot_card command line change.
+
 2008-12-18	Michael Hamel <nigel@adi.co.nz>
 
 	PR 1349/bsps
Index: c/src/lib/libbsp/powerpc/haleakala/dlentry/dlentry.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/haleakala/dlentry/dlentry.S,v
retrieving revision 1.1
diff -p -u -u -r1.1 dlentry.S
--- c/src/lib/libbsp/powerpc/haleakala/dlentry/dlentry.S	14 Jul 2008 08:45:02 -0000	1.1
+++ c/src/lib/libbsp/powerpc/haleakala/dlentry/dlentry.S	24 Apr 2009 07:09:17 -0000
@@ -40,6 +40,11 @@
  *  Id: dlentry.S,v 1.2 2000/08/02 16:30:57 joel Exp
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #include <rtems/asm.h>
 
 /*
@@ -137,10 +142,7 @@ text_length:
 
 			bl		__eabi				/* Initialise EABI: sets up r2 & r13 */
 			
-			lis		r5,environ@ha
-			la		r5,environ@l(r5)	/* environp */
-			li		r4, 0			/* argv */
-			li		r3, 0			/* argc */
+			li		r3, 0			/* command line */
 			
 			b       SYM (boot_card) 	 /* call the first C routine */
 
Index: c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog,v
retrieving revision 1.155
diff -p -u -u -r1.155 ChangeLog
--- c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog	12 Mar 2009 14:18:26 -0000	1.155
+++ c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* startup/start.S: Update for boot_card command line change.
+
 2009-03-12	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1385/cpukit
Index: c/src/lib/libbsp/powerpc/mbx8xx/startup/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/mbx8xx/startup/start.S,v
retrieving revision 1.10
diff -p -u -u -r1.10 start.S
--- c/src/lib/libbsp/powerpc/mbx8xx/startup/start.S	12 Sep 2005 13:32:58 -0000	1.10
+++ c/src/lib/libbsp/powerpc/mbx8xx/startup/start.S	24 Apr 2009 07:09:17 -0000
@@ -47,6 +47,11 @@
  * Copyright (c) 1999, National Research Council of Canada
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #include <rtems/asm.h>
 
 /*
@@ -322,9 +327,8 @@ ledblink2:	
 #endif
 	lis	r5,environ@ha
         la	r5,environ@l(r5)		/* environp */
-        /* clear argc and argv */
+        /* clear argc command line */
         xor     r3, r3, r3
-        xor     r4, r4, r4
 
         EXTERN_PROC (boot_card)
         bl       PROC (boot_card)	/* call the first C routine */
Index: c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog,v
retrieving revision 1.32
diff -p -u -u -r1.32 ChangeLog
--- c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog	12 Feb 2009 15:57:09 -0000	1.32
+++ c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* startup/start.S: Update for boot_card command line change.
+
 2009-02-12	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* startup/bspstart.c: Change prototype of IDLE thread to consistently
Index: c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S,v
retrieving revision 1.2
diff -p -u -u -r1.2 start.S
--- c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S	5 Aug 2008 13:32:58 -0000	1.2
+++ c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S	24 Apr 2009 07:09:17 -0000
@@ -18,6 +18,11 @@
  * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE.
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 /**
  * @defgroup mpc55xx_asm Assembler files
  *
@@ -207,10 +212,8 @@ start:
  * Start RTEMS
  */
 
-	/* Clear argc, argv and envp */
+	/* Clear command line */
 	xor r3, r3, r3
-	xor r4, r4, r4
-	xor r5, r5, r5
 	
 	/* Start RTEMS */
 	bl SYM (boot_card)
Index: c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog,v
retrieving revision 1.134
diff -p -u -u -r1.134 ChangeLog
--- c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog	12 Mar 2009 14:18:28 -0000	1.134
+++ c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-03-12	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1385/cpukit
Index: c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S,v
retrieving revision 1.7
diff -p -u -u -r1.7 start.S
--- c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S	5 Aug 2008 13:33:02 -0000	1.7
+++ c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -33,6 +33,11 @@
 
 #include <rtems/asm.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 /*
  *  The initial stack is set to run BELOW the code base address.
  *  (between the vectors and text sections)
@@ -139,10 +144,8 @@ text_length:
         /* Set up stack pointer = beginning of text section - 56 */
         addi    r1, r1, -56-4
 
-        /* Clear argc, argv and envp */
+        /* Clear cmdline */
         xor r3, r3, r3
-        xor r4, r4, r4
-        xor r5, r5, r5
 
         .extern SYM (boot_card)
         bl       SYM (boot_card)	/* call the first C routine */
Index: c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog,v
retrieving revision 1.31
diff -p -u -u -r1.31 ChangeLog
--- c/src/lib/libbsp/powerpc/mvme3100/ChangeLog	5 Mar 2009 21:17:54 -0000	1.31
+++ c/src/lib/libbsp/powerpc/mvme3100/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-03-05	Till Straumann <strauman@slac.stanford.edu>
 
 	* include/bsp.h, start/start.S, startup/bspstart.c: 
Index: c/src/lib/libbsp/powerpc/mvme3100/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/mvme3100/start/start.S,v
retrieving revision 1.3
diff -p -u -u -r1.3 start.S
--- c/src/lib/libbsp/powerpc/mvme3100/start/start.S	5 Mar 2009 21:17:55 -0000	1.3
+++ c/src/lib/libbsp/powerpc/mvme3100/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -19,6 +19,11 @@
 
 #include <bspopts.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #define SYNC \
 	sync; \
 	isync
@@ -82,9 +87,6 @@ __rtems_entry_point:
 	 * We are now in a environment that is totally independent from 
 	 * bootloader setup.
 	 */
-	lis	r5,environ@ha
-	la	r5,environ@l(r5)	/* environp */
-	li	r4, 0			/* argv */
-	li	r3, 0			/* argc */
+	li	r3, 0			/* command line */
 	bl	boot_card
 	/* point of no return: reset board here ? */
Index: c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog,v
retrieving revision 1.104
diff -p -u -u -r1.104 ChangeLog
--- c/src/lib/libbsp/powerpc/mvme5500/ChangeLog	6 Feb 2009 09:29:07 -0000	1.104
+++ c/src/lib/libbsp/powerpc/mvme5500/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-02-06	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Add network_CPPFLAGS += -D__BSD_VISIBLE.
Index: c/src/lib/libbsp/powerpc/mvme5500/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/mvme5500/start/start.S,v
retrieving revision 1.5
diff -p -u -u -r1.5 start.S
--- c/src/lib/libbsp/powerpc/mvme5500/start/start.S	3 Nov 2005 01:57:27 -0000	1.5
+++ c/src/lib/libbsp/powerpc/mvme5500/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -13,6 +13,11 @@
  * 
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include <rtems/powerpc/powerpc.h>
@@ -126,10 +131,7 @@ enter_C_code:
 	/*
 	 * We are know in a environment that is totally independent from bootloader setup.
 	 */
-        lis	r5,environ@ha
-        la	r5,environ@l(r5)	/* environp */
-	li	r4, 0			/* argv */
-	li	r3, 0			/* argc */
+	li	r3, 0			/* command line */
 	bl	boot_card
 	bl	_return_to_ppcbug
 	
Index: c/src/lib/libbsp/powerpc/psim/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/psim/ChangeLog,v
retrieving revision 1.161
diff -p -u -u -r1.161 ChangeLog
--- c/src/lib/libbsp/powerpc/psim/ChangeLog	7 Dec 2008 04:31:04 -0000	1.161
+++ c/src/lib/libbsp/powerpc/psim/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-07	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bsp_specs: Remove -Qy from *link.
Index: c/src/lib/libbsp/powerpc/psim/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/psim/start/start.S,v
retrieving revision 1.8
diff -p -u -u -r1.8 start.S
--- c/src/lib/libbsp/powerpc/psim/start/start.S	23 Sep 2008 17:30:01 -0000	1.8
+++ c/src/lib/libbsp/powerpc/psim/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -17,6 +17,11 @@
  *  $Id: start.S,v 1.8 2008/09/23 17:30:01 joel Exp $
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+
 #include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include <libcpu/io.h>
@@ -105,10 +110,7 @@ _start:
 	stwu	sp,-56(sp)		/* push another stack frame */
 	bl  FUNC_NAME(__eabi)
 
-        lis	r5,environ@ha
-        la	r5,environ@l(r5)	/* environp */
-	li	r4, 0			/* argv */
-	li	r3, 0			/* argc */
+	li	r3, 0			/* command line */
 
 	/* Let her rip */
 	bl	FUNC_NAME(boot_card)
Index: c/src/lib/libbsp/powerpc/score603e/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog,v
retrieving revision 1.162
diff -p -u -u -r1.162 ChangeLog
--- c/src/lib/libbsp/powerpc/score603e/ChangeLog	26 Feb 2009 17:37:43 -0000	1.162
+++ c/src/lib/libbsp/powerpc/score603e/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2009-02-26	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* irq/irq.c: Add bsp_interrupt_handler_default() so this BSP will link.
Index: c/src/lib/libbsp/powerpc/score603e/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/score603e/start/start.S,v
retrieving revision 1.8
diff -p -u -u -r1.8 start.S
--- c/src/lib/libbsp/powerpc/score603e/start/start.S	3 Sep 2008 20:36:21 -0000	1.8
+++ c/src/lib/libbsp/powerpc/score603e/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -17,6 +17,11 @@
  *  $Id: start.S,v 1.8 2008/09/03 20:36:21 joel Exp $
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #include "ppc-asm.h"
 
 	.file	"start.s"
@@ -114,10 +119,7 @@ past_constants:
 	stw	r0,0(sp)		/* clear back chain */
 	stwu	sp,-56(sp)		/* push another stack frame */
 
-        lis	r5,environ@ha
-        la	r5,environ@l(r5)	/* environp */
-	li	r4, 0			/* argv */
-	li	r3, 0			/* argc */
+	li	r3, 0			/* command line */
 	/* Let her rip */
 	bl	FUNC_NAME(boot_card)
 
Index: c/src/lib/libbsp/powerpc/shared/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/shared/start/start.S,v
retrieving revision 1.21
diff -p -u -u -r1.21 start.S
--- c/src/lib/libbsp/powerpc/shared/start/start.S	19 Sep 2008 20:41:36 -0000	1.21
+++ c/src/lib/libbsp/powerpc/shared/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -11,6 +11,11 @@
  *
  */
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 #include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include <rtems/powerpc/powerpc.h>
@@ -112,10 +117,7 @@ enter_C_code:
 	 * We are now in a environment that is totally independent from 
          * bootloader setup.
 	 */
-        lis	r5,environ@ha
-        la	r5,environ@l(r5)	/* environp */
-	li	r4, 0			/* argv */
-	li	r3, 0			/* argc */
+	li	r3, 0			/* command line */
 	bl	boot_card
 	bl	_return_to_ppcbug
 
Index: c/src/lib/libbsp/powerpc/ss555/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/ss555/ChangeLog,v
retrieving revision 1.52
diff -p -u -u -r1.52 ChangeLog
--- c/src/lib/libbsp/powerpc/ss555/ChangeLog	4 Dec 2008 20:29:55 -0000	1.52
+++ c/src/lib/libbsp/powerpc/ss555/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* startup/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/powerpc/ss555/startup/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/ss555/startup/start.S,v
retrieving revision 1.4
diff -p -u -u -r1.4 start.S
--- c/src/lib/libbsp/powerpc/ss555/startup/start.S	26 Oct 2004 14:12:06 -0000	1.4
+++ c/src/lib/libbsp/powerpc/ss555/startup/start.S	24 Apr 2009 07:09:17 -0000
@@ -52,6 +52,11 @@
 #include <rtems/asm.h>
 #include <rtems/powerpc/registers.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 /*
  *  The initial stack is set to the top of the internal RAM.
  *
@@ -289,10 +294,7 @@ spin:
 	mtmsr	r0
 
 	/* Start system. */
-	lis	r5, environ@ha
-	la	r5,environ@l(r5)	/* environp */
-	li	r4, 0			/* argv */
-	li	r3, 0			/* argc */
+	li	r3, 0			/* command line */
         EXTERN_PROC (boot_card)
         bl       PROC (boot_card)	/* call the first C routine */
 
Index: c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog,v
retrieving revision 1.26
diff -p -u -u -r1.26 ChangeLog
--- c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog	9 Mar 2009 16:59:57 -0000	1.26
+++ c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* startup/start.S: Update for boot_card command line change.
+
 2009-03-09	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* include/bsp.h: Added missing include.
Index: c/src/lib/libbsp/powerpc/tqm8xx/startup/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/tqm8xx/startup/start.S,v
retrieving revision 1.1
diff -p -u -u -r1.1 start.S
--- c/src/lib/libbsp/powerpc/tqm8xx/startup/start.S	8 Sep 2008 09:55:39 -0000	1.1
+++ c/src/lib/libbsp/powerpc/tqm8xx/startup/start.S	24 Apr 2009 07:09:17 -0000
@@ -24,6 +24,11 @@
 #include <bsp.h>
 #include <mpc8xx.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 .extern boot_card
 
 .section ".entry"  
@@ -144,8 +149,6 @@ start_code_in_ram:	
 
         /* Clear argc, argv and envp */
         xor r3, r3, r3
-        xor r4, r4, r4
-        xor r5, r5, r5
 
         bl      SYM (boot_card)  /* Call the first C routine */
 	
Index: c/src/lib/libbsp/powerpc/virtex/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/virtex/ChangeLog,v
retrieving revision 1.46
diff -p -u -u -r1.46 ChangeLog
--- c/src/lib/libbsp/powerpc/virtex/ChangeLog	4 Dec 2008 20:30:00 -0000	1.46
+++ c/src/lib/libbsp/powerpc/virtex/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* dlentry/dlentry.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/powerpc/virtex/dlentry/dlentry.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/virtex/dlentry/dlentry.S,v
retrieving revision 1.2
diff -p -u -u -r1.2 dlentry.S
--- c/src/lib/libbsp/powerpc/virtex/dlentry/dlentry.S	22 Jul 2008 05:47:31 -0000	1.2
+++ c/src/lib/libbsp/powerpc/virtex/dlentry/dlentry.S	24 Apr 2009 07:09:17 -0000
@@ -37,6 +37,11 @@
 
 #include <rtems/asm.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these errors.
+	
 /*
  *  The virtex ELF link scripts support three special sections:
  *    .entry    The actual entry point
Index: c/src/lib/libbsp/sh/gensh1/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sh/gensh1/ChangeLog,v
retrieving revision 1.115
diff -p -u -u -r1.115 ChangeLog
--- c/src/lib/libbsp/sh/gensh1/ChangeLog	4 Dec 2008 20:31:44 -0000	1.115
+++ c/src/lib/libbsp/sh/gensh1/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/sh/gensh1/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sh/gensh1/start/start.S,v
retrieving revision 1.6
diff -p -u -u -r1.6 start.S
--- c/src/lib/libbsp/sh/gensh1/start/start.S	16 Apr 2004 21:51:30 -0000	1.6
+++ c/src/lib/libbsp/sh/gensh1/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -21,6 +21,10 @@
 
 #include <rtems/asm.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning Please check and remove these warnings.
+	
 	BEGIN_CODE
 	PUBLIC(start)
 SYM (start):
@@ -54,10 +58,9 @@ SYM (start):
 	ldc     r0,vbr
 
 	! call the mainline
-	mov #0,r4		! argc
+	mov #0,r4		! command line
 	mov.l main_k,r0
 	jsr @r0
-	mov #0,r5		! argv
 
 	! call exit
 	mov	r0,r4
Index: c/src/lib/libbsp/sh/gensh2/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sh/gensh2/ChangeLog,v
retrieving revision 1.116
diff -p -u -u -r1.116 ChangeLog
--- c/src/lib/libbsp/sh/gensh2/ChangeLog	4 Dec 2008 20:31:45 -0000	1.116
+++ c/src/lib/libbsp/sh/gensh2/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/sh/gensh2/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sh/gensh2/start/start.S,v
retrieving revision 1.8
diff -p -u -u -r1.8 start.S
--- c/src/lib/libbsp/sh/gensh2/start/start.S	16 Apr 2004 21:51:30 -0000	1.8
+++ c/src/lib/libbsp/sh/gensh2/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -32,6 +32,10 @@
 
 #include <rtems/asm.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning Please check and remove these warnings.
+	
 	BEGIN_CODE
 	PUBLIC(start)
 
@@ -136,10 +140,10 @@ SYM (start):
 #endif /* ! STANDALONE_EVB */
 
 	! call the mainline
-	mov #0,r4		! argc
+	mov #0,r4		! command line
 	mov.l main_k,r0
 	jsr @r0
-	mov #0,r5		! argv - can place in dead slot
+	nop
 
 	! call exit
 	mov	r0,r4
Index: c/src/lib/libbsp/sh/gensh4/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sh/gensh4/ChangeLog,v
retrieving revision 1.98
diff -p -u -u -r1.98 ChangeLog
--- c/src/lib/libbsp/sh/gensh4/ChangeLog	4 Dec 2008 20:31:46 -0000	1.98
+++ c/src/lib/libbsp/sh/gensh4/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/sh/gensh4/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sh/gensh4/start/start.S,v
retrieving revision 1.6
diff -p -u -u -r1.6 start.S
--- c/src/lib/libbsp/sh/gensh4/start/start.S	21 Apr 2004 16:01:46 -0000	1.6
+++ c/src/lib/libbsp/sh/gensh4/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -40,6 +40,10 @@
 #include "rtems/score/sh4_regs.h"
 #include "rtems/score/sh7750_regs.h"
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning Please check and remove these warnings.
+	
         BEGIN_CODE
         PUBLIC(start)
 
@@ -174,7 +178,7 @@ zero_bss:
         mov #0,r4		! argc
         mov.l main_k,r0
         jsr @r0
-        mov #0,r5		! argv - can place in dead slot
+        nop
 
         ! call exit
         mov	r0,r4
Index: c/src/lib/libbsp/sh/shsim/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sh/shsim/ChangeLog,v
retrieving revision 1.119
diff -p -u -u -r1.119 ChangeLog
--- c/src/lib/libbsp/sh/shsim/ChangeLog	4 Dec 2008 20:31:48 -0000	1.119
+++ c/src/lib/libbsp/sh/shsim/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* start/start.S: Update for boot_card command line change.
+
 2008-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* bsp_specs: Move -e start from *link to *startfile to avoid warning
Index: c/src/lib/libbsp/sh/shsim/start/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sh/shsim/start/start.S,v
retrieving revision 1.7
diff -p -u -u -r1.7 start.S
--- c/src/lib/libbsp/sh/shsim/start/start.S	24 Sep 2008 16:39:44 -0000	1.7
+++ c/src/lib/libbsp/sh/shsim/start/start.S	24 Apr 2009 07:09:17 -0000
@@ -21,6 +21,11 @@
 
 #include <rtems/asm.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 	BEGIN_CODE
 	PUBLIC(start)
 SYM (start):
@@ -54,10 +59,10 @@ SYM (start):
 	ldc     r0,vbr
 
 	! call the mainline
-	mov #0,r4		! argc
+	mov #0,r4		! command line
 	mov.l main_k,r0
 	jsr @r0
-	mov #0,r5		! argv
+	
 
 	! call exit
 	mov	r0,r4
Index: c/src/lib/libbsp/shared/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/shared/ChangeLog,v
retrieving revision 1.136
diff -p -u -u -r1.136 ChangeLog
--- c/src/lib/libbsp/shared/ChangeLog	10 Mar 2009 17:40:06 -0000	1.136
+++ c/src/lib/libbsp/shared/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,9 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* bootcard.c, include/bootcard.h: Remove argc/argv/envp and
+	replace with a single BSP boot command line a BSP can optionally
+	support.
+
 2009-03-10	Eric Norum <norume@aps.anl.gov>
 
 	* bootcard.c: Swap order of RTEMS Workspace and Malloc Heap. This
Index: c/src/lib/libbsp/shared/bootcard.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/shared/bootcard.c,v
retrieving revision 1.42
diff -p -u -u -r1.42 bootcard.c
--- c/src/lib/libbsp/shared/bootcard.c	10 Mar 2009 17:40:06 -0000	1.42
+++ c/src/lib/libbsp/shared/bootcard.c	24 Apr 2009 07:09:17 -0000
@@ -48,9 +48,10 @@
 #include <bsp/bootcard.h>
 
 /*
- *  Since there is a forward reference
+ *  At most a single pointer to the cmdline for those target
+ *  short on memory and not supporting a command line.
  */
-char *rtems_progname;
+const char *bsp_boot_cmdline;
 
 /*
  * Are we using a single heap for the RTEMS Workspace and C Program Heap?
@@ -114,21 +115,15 @@ static rtems_status_code bootcard_bsp_li
  *  as much as possible.
  */
 int boot_card(
-  int    argc, 
-  char **argv, 
-  char **envp
+  const char *cmdline
 )
 {
-  static char            *argv_pointer = NULL;
-  static char            *envp_pointer = NULL;
-  char                  **argv_p = &argv_pointer;
-  char                  **envp_p = &envp_pointer;
-  rtems_interrupt_level   bsp_isr_level;
-  rtems_status_code       sc = RTEMS_SUCCESSFUL;
-  void                   *work_area_start = NULL;
-  intptr_t                work_area_size = 0;
-  void                   *heap_start = NULL;
-  intptr_t                heap_size = 0;
+  rtems_interrupt_level  bsp_isr_level;
+  rtems_status_code      sc = RTEMS_SUCCESSFUL;
+  void                  *work_area_start = NULL;
+  intptr_t               work_area_size = 0;
+  void                  *heap_start = NULL;
+  intptr_t               heap_size = 0;
 
   /*
    * Special case for PowerPC: The interrupt disable mask is stored in SPRG0.
@@ -143,22 +138,7 @@ int boot_card(
    */
   rtems_interrupt_disable( bsp_isr_level );
 
-  /*
-   *  Set things up so we have real pointers for argv and envp.
-   *  If the BSP has passed us something useful, then pass it on.
-   *  Somehow we need to eventually make this available to
-   *  a real main() in user land. :)
-   */
-  if ( argv ) argv_p = argv;
-  if ( envp ) envp_p = envp;
-
-  /*
-   *  Set the program name in case some application cares.
-   */
-  if ((argc > 0) && argv && argv[0])
-    rtems_progname = argv[0];
-  else
-    rtems_progname = "RTEMS";
+  bsp_boot_cmdline = cmdline;
 
   /*
    * Invoke Board Support Package initialization routine written in C.
@@ -169,7 +149,8 @@ int boot_card(
    *  Find out where the block of memory the BSP will use for
    *  the RTEMS Workspace and the C Program Heap is.
    */
-  bsp_get_work_area(&work_area_start, &work_area_size, &heap_start, &heap_size);
+  bsp_get_work_area(&work_area_start, (ssize_t*) &work_area_size,
+                    &heap_start, (ssize_t*) &heap_size);
 
   if ( work_area_size <= Configuration.work_space_size ) {
     printk( "bootcard: Work space too big for work area!\n");
Index: c/src/lib/libbsp/shared/bspinit.c
===================================================================
RCS file: c/src/lib/libbsp/shared/bspinit.c
diff -N c/src/lib/libbsp/shared/bspinit.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ c/src/lib/libbsp/shared/bspinit.c	24 Apr 2009 07:09:17 -0000
@@ -0,0 +1,93 @@
+/*
+ *  COPYRIGHT (c) 1989-2009.
+ *  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: bspstart.c,v 1.1 2008/09/16 19:10:15 joel Exp $
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <bsp.h>
+#include <bsp/bootcard.h>
+
+/*
+ * This routine calls main from a confdefs.h default Init task
+ * set up. The bootcard will provide the task argument as
+ * command line string (ASCIIZ).
+ */
+
+int main (int argc, char* argv[]);
+
+void Init (rtems_task_argument arg)
+{
+  const char* boot_cmdline = *((const char**) arg);
+  char*       cmdline = 0;
+  char*       command;
+  int         argc = 0;
+  char**      argv = NULL;
+  int         result = -124;
+
+  if (boot_cmdline)
+  {
+    cmdline = malloc (strlen (boot_cmdline) + 1);
+  
+    if (cmdline)
+    {
+      strcpy (cmdline, boot_cmdline);
+
+      command = cmdline;
+
+      /*
+       * Break the line up into arguments with "" being ignored.
+       */
+      while (true)
+      {
+        command = strtok (command, " \t\r\n");
+        if (command == NULL)
+          break;
+        argc++;
+        command = '\0';
+      }
+
+      argv = calloc (argc, sizeof (char*));
+
+      if (argv)
+      {
+        int a;
+        
+        command = cmdline;
+        argv[0] = command;
+
+        for (a = 1; a < argc; a++)
+        {
+          command += strlen (command) + 1;
+          argv[a] = command;
+        }
+      }
+      else
+        argc = 0;
+    }
+  }
+  
+#ifdef RTEMS_NETWORKING
+  rtems_bsdnet_initialize_network ();
+#endif
+
+  result = main (argc, argv);
+ 
+  free (argv);
+  free (cmdline);
+
+  exit (result);
+}
+
+/*
+ * By making this a weak alias and a user can provide there own.
+ */
+
+void Init (rtems_task_argument arg) __attribute__ ((weak));
Index: c/src/lib/libbsp/shared/include/bootcard.h
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/shared/include/bootcard.h,v
retrieving revision 1.5
diff -p -u -u -r1.5 bootcard.h
--- c/src/lib/libbsp/shared/include/bootcard.h	2 Oct 2008 19:13:05 -0000	1.5
+++ c/src/lib/libbsp/shared/include/bootcard.h	24 Apr 2009 07:09:17 -0000
@@ -60,7 +60,7 @@ void bsp_get_work_area(
   ssize_t  *heap_size
 );
 
-int boot_card( int argc, char **argv, char **envp);
+int boot_card( const char *cmdline );
 
 void bsp_libc_init( void *heap_start, size_t heap_size, size_t sbrk_amount);
 
Index: c/src/lib/libbsp/sparc/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sparc/ChangeLog,v
retrieving revision 1.66
diff -p -u -u -r1.66 ChangeLog
--- c/src/lib/libbsp/sparc/ChangeLog	27 Feb 2009 15:33:07 -0000	1.66
+++ c/src/lib/libbsp/sparc/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* shared/start/start.S: Update for boot_card command line change.
+
 2009-02-27	Daniel Hellstrom <daniel@gaisler.com>
 
 	PR 1386/bsps
Index: c/src/lib/libbsp/sparc/shared/start.S
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sparc/shared/start.S,v
retrieving revision 1.12
diff -p -u -u -r1.12 start.S
--- c/src/lib/libbsp/sparc/shared/start.S	27 Feb 2009 15:33:08 -0000	1.12
+++ c/src/lib/libbsp/sparc/shared/start.S	24 Apr 2009 07:09:17 -0000
@@ -20,6 +20,11 @@
 #include <rtems/asm.h>
 #include <bspopts.h>
 
+#warning Call to boot_card has changed and needs checking.
+#warning The call is "void boot_card(const char* cmdline);"
+#warning You need to pass a NULL.
+#warning Please check and remove these warnings.
+	
 /*
  *  Unexpected trap will halt the processor by forcing it to error state
  */
@@ -329,9 +334,7 @@ zerobss:
         bleu,a zerobss
         nop
 
-        mov     %0, %o2                 ! environ
-        mov     %0, %o1                 ! argv
-        mov     %0, %o0                 ! argc
+        mov     %0, %o0                 ! command line
         call    SYM(boot_card)
         sub     %sp, 0x60, %sp          ! room for boot_card to save args
         nop
Index: c/src/lib/libbsp/unix/posix/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/unix/posix/ChangeLog,v
retrieving revision 1.93
diff -p -u -u -r1.93 ChangeLog
--- c/src/lib/libbsp/unix/posix/ChangeLog	1 Dec 2008 17:30:05 -0000	1.93
+++ c/src/lib/libbsp/unix/posix/ChangeLog	24 Apr 2009 07:09:17 -0000
@@ -1,3 +1,7 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* startup/main.c: Update for boot_card command line change.
+
 2008-12-01	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* bsp_specs, startup/bspgetworkarea.c: Links hello again.
Index: c/src/lib/libbsp/unix/posix/startup/main.c
===================================================================
RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/unix/posix/startup/main.c,v
retrieving revision 1.2
diff -p -u -u -r1.2 main.c
--- c/src/lib/libbsp/unix/posix/startup/main.c	24 Jul 2007 20:52:56 -0000	1.2
+++ c/src/lib/libbsp/unix/posix/startup/main.c	24 Apr 2009 07:09:17 -0000
@@ -24,7 +24,7 @@ int main(
   char **argv
 )
 {
-  boot_card();
+  boot_card(0);
 
   return 0;
 }
Index: cpukit/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/ChangeLog,v
retrieving revision 1.1772
diff -p -u -u -r1.1772 ChangeLog
--- cpukit/ChangeLog	15 Apr 2009 08:36:12 -0000	1.1772
+++ cpukit/ChangeLog	24 Apr 2009 07:09:18 -0000
@@ -1,3 +1,9 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* sapi/include/confdefs.h: Add a prototype for Init with C linkage
+	and define Init task command line arguments if confdefs.h provides
+	an Init entry point.
+
 2009-04-15	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Disable LIBSHELL for unix targets.
Index: cpukit/sapi/include/confdefs.h
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/sapi/include/confdefs.h,v
retrieving revision 1.118
diff -p -u -u -r1.118 confdefs.h
--- cpukit/sapi/include/confdefs.h	5 Jan 2009 20:16:07 -0000	1.118
+++ cpukit/sapi/include/confdefs.h	24 Apr 2009 07:09:18 -0000
@@ -518,7 +518,16 @@ rtems_fs_init_functions_t    rtems_fs_in
 #endif
 
 #ifndef CONFIGURE_INIT_TASK_ENTRY_POINT
+  #ifdef __cplusplus
+  extern "C" {
+  #endif
+    rtems_task Init (rtems_task_argument );
+  #ifdef __cplusplus
+  }
+  #endif
   #define CONFIGURE_INIT_TASK_ENTRY_POINT   Init
+  extern const char* bsp_boot_cmdline;
+  #define CONFIGURE_INIT_TASK_ARGUMENTS     ((rtems_task_argument) &bsp_boot_cmdline)
 #endif
 
 #ifndef CONFIGURE_INIT_TASK_INITIAL_MODES
Index: testsuites/samples/ChangeLog
===================================================================
RCS file: /usr1/CVS/rtems/testsuites/samples/ChangeLog,v
retrieving revision 1.149
diff -p -u -u -r1.149 ChangeLog
--- testsuites/samples/ChangeLog	14 Apr 2009 10:22:53 -0000	1.149
+++ testsuites/samples/ChangeLog	24 Apr 2009 07:09:18 -0000
@@ -1,3 +1,8 @@
+2009-04-23	Chris Johns <chrisj@rtems.org>
+
+	* iostream/system.h: Remove the Init prototype. Provide in
+	confdefs.h.
+
 2009-04-14	Sebastian Huber <Sebastian.Huber@embedded-brains.de>
 
 	* fileio/init.c: Removed obsolete header include.
Index: testsuites/samples/iostream/system.h
===================================================================
RCS file: /usr1/CVS/rtems/testsuites/samples/iostream/system.h,v
retrieving revision 1.4
diff -p -u -u -r1.4 system.h
--- testsuites/samples/iostream/system.h	17 Jun 2008 18:50:30 -0000	1.4
+++ testsuites/samples/iostream/system.h	24 Apr 2009 07:09:18 -0000
@@ -15,12 +15,6 @@
 
 #include <rtems.h>
 
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
 /* configuration information */
 
 #include <bsp.h> /* for device driver prototypes */
