From 3ccd9de51b6a594793a683dc98fdaa32b945c140 Mon Sep 17 00:00:00 2001 From: Till Straumann Date: Tue, 20 Oct 2009 18:00:47 +0000 Subject: 2009-10-20 Till Straumann * startup/bspstart.c: let 'save_boot_params()' return a pointer to the commandline saved by the BSP which is NULL in this case. This pointer could be passed on to 'boot_card()' as it is done by other BSPs. This 'start/start.S' file however, passes a NULL pointer directly to boot_card() (w/o ever calling save_boot_params()). --- c/src/lib/libbsp/powerpc/ep1a/ChangeLog | 9 +++++++++ c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog index d77ad1745f..e066b62b8d 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog @@ -1,3 +1,12 @@ +2009-10-20 Till Straumann + + * startup/bspstart.c: + let 'save_boot_params()' return a pointer to the commandline + saved by the BSP which is NULL in this case. This pointer could + be passed on to 'boot_card()' as it is done by other BSPs. + This 'start/start.S' file however, passes a NULL pointer + directly to boot_card() (w/o ever calling save_boot_params()). + 2009-10-20 Ralf Corsépius * configure.ac: Don't add -ansi -fasm to CFLAGS. diff --git a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c index a2fcfbac58..3c28bba449 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c @@ -168,13 +168,15 @@ void zero_bss(void) memset(__bss_start, 0, ((unsigned) __rtems_end) - ((unsigned)__bss_start)); } -void save_boot_params(RESIDUAL* r3, void *r4, void* r5, char *additional_boot_options) +char * save_boot_params(RESIDUAL* r3, void *r4, void* r5, char *additional_boot_options) { #if 0 residualCopy = *r3; strncpy(loaderParam, additional_boot_options, MAX_LOADER_ADD_PARM); loaderParam[MAX_LOADER_ADD_PARM - 1] ='\0'; + return loaderParam; #endif + return 0; } unsigned int EUMBBAR; -- cgit v1.2.3