diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-07 21:50:11 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-07 21:50:11 +0000 |
| commit | de237f40fd5d73801147a8bbf7b278c4677714fd (patch) | |
| tree | 6c416095ecd92ec41163d0238c4dc2dda3e66c5a /c/src/lib/libbsp/arm/gba/start/start.S | |
| parent | 2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-de237f40fd5d73801147a8bbf7b278c4677714fd.tar.bz2 | |
2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com>
* start/start.S: Verify boot_card() is passed a NULL.
Diffstat (limited to 'c/src/lib/libbsp/arm/gba/start/start.S')
| -rw-r--r-- | c/src/lib/libbsp/arm/gba/start/start.S | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/c/src/lib/libbsp/arm/gba/start/start.S b/c/src/lib/libbsp/arm/gba/start/start.S index 33a7a823e6..1b55d2a19e 100644 --- a/c/src/lib/libbsp/arm/gba/start/start.S +++ b/c/src/lib/libbsp/arm/gba/start/start.S @@ -50,11 +50,6 @@ * INABILITY TO USE THIS CODE. *****************************************************************************/ -#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 __asm__ #include <rtems/asm.h> #include <asm_macros.h> @@ -283,16 +278,17 @@ /* Enter the C code. If it returns, then restart */ STATIC_THUMB_FUNCTION(_gba_call_arm_boot_card) - adr r0, .Larm - bx r0 + adr r1, .Larm + bx r1 .arm .Larm: - ldr r0, =boot_card - bl SYM(_gba_call_via_r0) + ldr r1, =boot_card + mov r0, #0 + bl SYM(_gba_call_via_r1) ldr r0, =SYM(_gba_reset) - SYM(_gba_call_via_r0): - bx r0 + SYM(_gba_call_via_r1): + bx r1 /* GBA Reset */ PUBLIC_ARM_FUNCTION(_gba_reset) |