From de237f40fd5d73801147a8bbf7b278c4677714fd Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 7 Apr 2010 21:50:11 +0000 Subject: 2010-04-07 Joel Sherrill * start/start.S: Verify boot_card() is passed a NULL. --- c/src/lib/libbsp/arm/gba/ChangeLog | 4 ++++ c/src/lib/libbsp/arm/gba/start/start.S | 18 +++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libbsp/arm/gba') diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog index 6e3f5b3d5e..769f222cfc 100644 --- a/c/src/lib/libbsp/arm/gba/ChangeLog +++ b/c/src/lib/libbsp/arm/gba/ChangeLog @@ -1,3 +1,7 @@ +2010-04-07 Joel Sherrill + + * start/start.S: Verify boot_card() is passed a NULL. + 2009-12-07 Ralf Corsépius * console/conio.c, console/console.c, include/conio.h: 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 #include @@ -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) -- cgit v1.2.3