summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-10-11 18:32:17 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-10-11 18:32:17 +0000
commitb56b0a37f4ea5531b3db12ac968b85f18e1f6756 (patch)
tree3fe3bbafa7a6e131a69a7a364a4fdb9f496c487b /firmware/target/arm
parente0f8c312160ebe0029c2529f8de569d6b85aa782 (diff)
downloadrockbox-b56b0a37f4ea5531b3db12ac968b85f18e1f6756.tar.gz
rockbox-b56b0a37f4ea5531b3db12ac968b85f18e1f6756.zip
remove dead code from firmware/target/arm/crt0.S, and conditionalise bits of it
make the meizu builds compile with the new crt0.S location git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18776 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/crt0.S19
-rw-r--r--firmware/target/arm/s5l8700/boot.lds2
2 files changed, 3 insertions, 18 deletions
diff --git a/firmware/target/arm/crt0.S b/firmware/target/arm/crt0.S
index c01cb3e165..3bd061a17a 100644
--- a/firmware/target/arm/crt0.S
+++ b/firmware/target/arm/crt0.S
@@ -34,24 +34,11 @@ start:
b reserved_handler
b irq_handler
b fiq_handler
+#if CONFIG_CPU==S5L8700
.word 0x43554644 /* DFUC */
-
+#endif
newstart:
msr cpsr_c, #0xd3 /* enter supervisor mode, disable IRQ/FIQ */
-
-#if 0
- /* set PWRON to 1 */
- ldr r1, =0x3CF00014
- ldr r2, [r1]
- orr r2, r2, #0x8
- str r2, [r1]
-
- ldr r1, =0x3CF00010
- ldr r2, [r1]
- bic r2, r2, #0xf000
- orr r2, r2, #0x1000
- str r2, [r1]
-#endif
/* Initialise bss section to zero */
ldr r2, =_edata
@@ -127,5 +114,3 @@ irq_stack:
fiq_stack:
end:
- /*.word 0xA5A5A5A5
- .word 0x5A5A5A5A*/
diff --git a/firmware/target/arm/s5l8700/boot.lds b/firmware/target/arm/s5l8700/boot.lds
index 14b4d772e1..8ce942c9b2 100644
--- a/firmware/target/arm/s5l8700/boot.lds
+++ b/firmware/target/arm/s5l8700/boot.lds
@@ -3,7 +3,7 @@
ENTRY(start)
OUTPUT_FORMAT(elf32-bigarm)
OUTPUT_ARCH(arm)
-STARTUP(target/arm/s5l8700/crt0.o)
+STARTUP(target/arm/crt0.o)
/* DRAMORIG is in fact 0x8000000 but remapped to 0x0 */
#define DRAMORIG 0x0