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:
     mov    r1, #WAKE
     str    r1, [r0]
 
-#if defined(SANSA_C200) || defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330)
+#if defined(SANSA_C200) || defined(PHILIPS_HDD1630)
     /* Magic for loading the c200 OF */
     ldr    r0, =0xb00d10ad
     mov    r1, #0x700
@@ -164,6 +164,14 @@ cpu:
     mov    r3, #0x7
 #endif
 
+#if defined(PHILIPS_HDD6330)
+    /* Magic for loading the HDD6XX0 OF */
+    ldr    r0, =0xb00d10ad
+    mov    r1, #0x800
+    ldr    r2, =0xfff0
+    mov    r3, #0x7
+#endif
+
     ldr    r4, =startup_loc
     ldr    pc, [r4]
 
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 @@
 #include "logf.h"
 
 static int int_btn = BUTTON_NONE;
+#ifndef BOOTLOADER
 static int old_pos = -1;
-
 static int scroll_repeat = BUTTON_NONE;
+#endif
 static int repeat = 0;
 
 /*