summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/tcc77x
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2009-01-08 23:16:51 +0000
committerDave Chapman <dave@dchapman.com>2009-01-08 23:16:51 +0000
commite04e16395f32d339d97a682ceca5d8cf4cfa1903 (patch)
tree15170e0d79d47f13d83c7b7b8625b7597315d7d9 /firmware/target/arm/tcc77x
parent759bede3bc38946e71090822da67aeb928a2c871 (diff)
downloadrockbox-e04e16395f32d339d97a682ceca5d8cf4cfa1903.tar.gz
rockbox-e04e16395f32d339d97a682ceca5d8cf4cfa1903.tar.bz2
rockbox-e04e16395f32d339d97a682ceca5d8cf4cfa1903.zip
Replace some nasty hard-coded offsets with labels
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19730 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/tcc77x')
-rw-r--r--firmware/target/arm/tcc77x/crt0.S9
1 files changed, 5 insertions, 4 deletions
diff --git a/firmware/target/arm/tcc77x/crt0.S b/firmware/target/arm/tcc77x/crt0.S
index 03dc2a9771..68946eb6fa 100644
--- a/firmware/target/arm/tcc77x/crt0.S
+++ b/firmware/target/arm/tcc77x/crt0.S
@@ -48,8 +48,9 @@ start:
The following two values are filled in by mktccboot.
*/
- .word 0 /* Saved entrypoint of original firmware*/
- .word 0 /* Location in RAM of the start of our bootloader */
+of_entrypoint: .word 0 /* Saved entrypoint of original firmware*/
+bl_entrypoint: .word 0 /* Location in RAM of the start of our bootloader */
+
#else
// ldr pc, =start_loc /* jump to the main entry point */
b start_loc
@@ -95,7 +96,7 @@ start_loc:
#error No bootup key detection implemented for this target
#endif
- ldrne pc, [pc, #-28] /* Jump to OF if HOLD button not pressed */
+ ldrne pc, of_entrypoint /* Jump to OF if HOLD button not pressed */
#endif /* TCCBOOT */
/* We are now definitely executing the bootloader, so we relocate to the
@@ -103,7 +104,7 @@ start_loc:
*/
#ifdef TCCBOOT
- ldr r0, [pc, #-28] /* mktccboot fills in the load address */
+ ldr r0, bl_entrypoint
#else
mov r0, #0x20000000 /* Otherwise, load address is the start of DRAM */
#endif