diff options
| author | Chris Johns <chrisj@rtems.org> | 2009-04-28 06:35:06 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2009-04-28 06:35:06 +0000 |
| commit | 68e27077013a80564057704b8a7260e462fa181d (patch) | |
| tree | 018f09a300515c5f2394a74f743c4fcab21c9af7 /c | |
| parent | 2009-04-28 Chris Johns <chrisj@rtems.org> (diff) | |
| download | rtems-68e27077013a80564057704b8a7260e462fa181d.tar.bz2 | |
2009-04-28 Chris Johns <chrisj@rtems.org>
* shared/start/start.S: Update for boot_card command line change.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/start/start.S | 10 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/shared/start.S | 9 |
4 files changed, 20 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index d04728371c..b56963c0d5 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 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 diff --git a/c/src/lib/libbsp/powerpc/shared/start/start.S b/c/src/lib/libbsp/powerpc/shared/start/start.S index 5c4d4e29f4..49c8c361e0 100644 --- a/c/src/lib/libbsp/powerpc/shared/start/start.S +++ b/c/src/lib/libbsp/powerpc/shared/start/start.S @@ -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 diff --git a/c/src/lib/libbsp/sparc/ChangeLog b/c/src/lib/libbsp/sparc/ChangeLog index 9b1ec1b773..fd8b237697 100644 --- a/c/src/lib/libbsp/sparc/ChangeLog +++ b/c/src/lib/libbsp/sparc/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 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 diff --git a/c/src/lib/libbsp/sparc/shared/start.S b/c/src/lib/libbsp/sparc/shared/start.S index 0227dd20ba..0568a18a05 100644 --- a/c/src/lib/libbsp/sparc/shared/start.S +++ b/c/src/lib/libbsp/sparc/shared/start.S @@ -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 |