2009-10-20 Till Straumann <strauman@slac.stanford.edu>

	* start/start.S, startup/bspstart.c:
	let 'save_boot_params()' return a pointer to the commandline
	saved by the BSP and pass this pointer on to 'boot_card()'.

6 files changed, 18 insertions, 14 deletions

diff --git a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
index b104282f32..3e8b41af53 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
@@ -1,5 +1,11 @@
 2009-10-20	Till Straumann <strauman@slac.stanford.edu>
 
+	* start/start.S, startup/bspstart.c:
+	let 'save_boot_params()' return a pointer to the commandline
+	saved by the BSP and pass this pointer on to 'boot_card()'.
+
+2009-10-20	Till Straumann <strauman@slac.stanford.edu>
+
 	* network/tsec.c: fixed compiler warnings.
 
 2009-10-20	Ralf Corsépius <ralf.corsepius@rtems.org>
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/start/start.S b/c/src/lib/libbsp/powerpc/mvme3100/start/start.S
index 517801b00e..dbbe5f69c7 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/start/start.S
+++ b/c/src/lib/libbsp/powerpc/mvme3100/start/start.S
@@ -19,11 +19,6 @@
 
 #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
@@ -87,6 +82,6 @@ __rtems_entry_point:
 	 * We are now in a environment that is totally independent from 
 	 * bootloader setup.
 	 */
-	li	r3, 0			/* command line */
+    /* pass result of 'save_boot_params' to 'boot_card' in R3 */
 	bl	boot_card
 	/* point of no return: reset board here ? */
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
index a6e8f9ad29..bb80b1fa69 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
@@ -130,11 +130,12 @@ char *rtems_progname;
  *  Use the shared implementations of the following routines
  */
 
-void save_boot_params(void* r3, void *r4, void* r5, char *additional_boot_options)
+char * save_boot_params(void* r3, void *r4, void* r5, char *additional_boot_options)
 {
 
   strncpy(cmdline_buf, additional_boot_options, CMDLINE_BUF_SIZE);
   cmdline_buf[CMDLINE_BUF_SIZE - 1] ='\0';
+  return cmdline_buf;
 }
 
 #define CS_CONFIG_CS_EN (1<<31)
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index 6640590593..0d79e04f3a 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-20	Till Straumann <strauman@slac.stanford.edu>
+
+	* start/start.S, startup/bspstart.c:
+	let 'save_boot_params()' return a pointer to the commandline
+	saved by the BSP and pass this pointer on to 'boot_card()'.
+
 2009-10-20	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Don't add -ansi -fasm to CFLAGS.
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/start/start.S b/c/src/lib/libbsp/powerpc/mvme5500/start/start.S
index db53b0e89d..41b4d59fdb 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/start/start.S
+++ b/c/src/lib/libbsp/powerpc/mvme5500/start/start.S
@@ -13,11 +13,6 @@
  * 
  */
 
-#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>
@@ -131,7 +126,7 @@ enter_C_code:
 	/*
 	 * We are know in a environment that is totally independent from bootloader setup.
 	 */
-	li	r3, 0			/* command line */
+    /* pass result of 'save_boot_params' to 'boot_card' in R3 */
 	bl	boot_card
 	bl	_return_to_ppcbug
 	
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
index 88f953121a..6dfe5a4121 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
@@ -182,7 +182,7 @@ void zero_bss()
 /* this routine is called early at shared/start/start.S 
  * and must be safe with a not properly aligned stack
  */
-void
+char *
 save_boot_params(
   void *r3,
   void *r4,
@@ -200,6 +200,7 @@ save_boot_params(
 
   memmove(cmdline_buf, cmdline_start, i);
   cmdline_buf[i]=0;
+  return cmdline_buf;
 }
 
 /*