RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* 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()'.
This commit is contained in:
Till Straumann
2009-10-20 17:55:18 +00:00
parent 27e966f1d1
commit 5eccbac62e
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
View File

@@ -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 Till Straumann <strauman@slac.stanford.edu>
* network/tsec.c: fixed compiler warnings.

7
c/src/lib/libbsp/powerpc/mvme3100/start/start.S
View File

@@ -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 ? */

3
c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
View File

@@ -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)

6
c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
View File

@@ -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.

7
c/src/lib/libbsp/powerpc/mvme5500/start/start.S
View File

@@ -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

3
c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
View File

@@ -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;
}
/*