diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2009-10-20 17:55:18 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2009-10-20 17:55:18 +0000 |
| commit | 5eccbac62e4d57a5b7d70692c531758cd2ac7f37 (patch) | |
| tree | 71080585dd243f95106f7ad3bbe91c08dc5f831f /c/src/lib/libbsp/powerpc/mvme3100 | |
| parent | 2009-10-20 Till Straumann <strauman@slac.stanford.edu> (diff) | |
| download | rtems-5eccbac62e4d57a5b7d70692c531758cd2ac7f37.tar.bz2 | |
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()'.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mvme3100')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/start/start.S | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c | 3 |
3 files changed, 9 insertions, 7 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) |