diff options
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/crt0-pp-bl.S | 10 | ||||
-rw-r--r-- | firmware/target/arm/philips/hdd6330/button-hdd6330.c | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/firmware/target/arm/crt0-pp-bl.S b/firmware/target/arm/crt0-pp-bl.S index 79235a6371..d1d9182314 100644 --- a/firmware/target/arm/crt0-pp-bl.S +++ b/firmware/target/arm/crt0-pp-bl.S | |||
@@ -156,7 +156,7 @@ cpu: | |||
156 | mov r1, #WAKE | 156 | mov r1, #WAKE |
157 | str r1, [r0] | 157 | str r1, [r0] |
158 | 158 | ||
159 | #if defined(SANSA_C200) || defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) | 159 | #if defined(SANSA_C200) || defined(PHILIPS_HDD1630) |
160 | /* Magic for loading the c200 OF */ | 160 | /* Magic for loading the c200 OF */ |
161 | ldr r0, =0xb00d10ad | 161 | ldr r0, =0xb00d10ad |
162 | mov r1, #0x700 | 162 | mov r1, #0x700 |
@@ -164,6 +164,14 @@ cpu: | |||
164 | mov r3, #0x7 | 164 | mov r3, #0x7 |
165 | #endif | 165 | #endif |
166 | 166 | ||
167 | #if defined(PHILIPS_HDD6330) | ||
168 | /* Magic for loading the HDD6XX0 OF */ | ||
169 | ldr r0, =0xb00d10ad | ||
170 | mov r1, #0x800 | ||
171 | ldr r2, =0xfff0 | ||
172 | mov r3, #0x7 | ||
173 | #endif | ||
174 | |||
167 | ldr r4, =startup_loc | 175 | ldr r4, =startup_loc |
168 | ldr pc, [r4] | 176 | ldr pc, [r4] |
169 | 177 | ||
diff --git a/firmware/target/arm/philips/hdd6330/button-hdd6330.c b/firmware/target/arm/philips/hdd6330/button-hdd6330.c index 1d15b11a1e..fc171c72ba 100644 --- a/firmware/target/arm/philips/hdd6330/button-hdd6330.c +++ b/firmware/target/arm/philips/hdd6330/button-hdd6330.c | |||
@@ -29,9 +29,10 @@ | |||
29 | #include "logf.h" | 29 | #include "logf.h" |
30 | 30 | ||
31 | static int int_btn = BUTTON_NONE; | 31 | static int int_btn = BUTTON_NONE; |
32 | #ifndef BOOTLOADER | ||
32 | static int old_pos = -1; | 33 | static int old_pos = -1; |
33 | |||
34 | static int scroll_repeat = BUTTON_NONE; | 34 | static int scroll_repeat = BUTTON_NONE; |
35 | #endif | ||
35 | static int repeat = 0; | 36 | static int repeat = 0; |
36 | 37 | ||
37 | /* | 38 | /* |