3 files changed, 12 insertions, 7 deletions

diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index f3f751d374..19bc9591c2 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -12,9 +12,9 @@ gigabeat-s.c
 #elif defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || \
       defined(SANSA_E200) || defined(SANSA_C200) || \
       defined(MROBE_100)  || defined(PHILIPS_SA9200) || \
-      defined(PHILIPS_HDD1630) || defined(SAMSUNG_YH820) || \
-      defined(SAMSUNG_YH920) || defined(SAMSUNG_YH925) || \
-      defined(SANSA_VIEW)
+      defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) || \
+      defined(SAMSUNG_YH820) || defined(SAMSUNG_YH920) || \
+      defined(SAMSUNG_YH925) || defined(SANSA_VIEW)
 #ifdef E200R_INSTALLER
 main-e200r-installer.c
 #elif defined(C240_ERASE)
diff --git a/bootloader/common.c b/bootloader/common.c
index bfe44a2687..0d66031ebf 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -40,9 +40,11 @@
    on a button press - currently only the ipod, H10 and Sansa versions do. */
 #if defined(IPOD_ARCH) || defined(IRIVER_H10)  || defined(IRIVER_H10_5GB) \
  || defined(SANSA_E200) || defined(SANSA_C200) || defined(GIGABEAT_F) \
- || defined(PHILIPS_SA9200) || (CONFIG_CPU == AS3525) || defined(COWON_D2) \
- || defined(MROBE_100) || defined(PHILIPS_HDD1630) || defined(MROBE_500) \
- || defined(SAMSUNG_YH925) || defined(SAMSUNG_YH920) || defined(SAMSUNG_YH820) \
+ || (CONFIG_CPU == AS3525) || defined(COWON_D2) \
+ || defined(MROBE_100) || defined(MROBE_500) \
+ || defined(SAMSUNG_YH925) || defined(SAMSUNG_YH920) \
+ || defined(SAMSUNG_YH820) || defined(PHILIPS_SA9200) \
+ || defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) \
  || defined(ONDA_VX747)
 bool verbose = false;
 #else
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c
index ef0e199e3a..fe93f14eaa 100644
--- a/bootloader/main-pp.c
+++ b/bootloader/main-pp.c
@@ -75,6 +75,9 @@ extern int show_logo(void);
 #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
 #define BOOTLOADER_BOOT_OF      BUTTON_MENU
 
+#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
+#define BOOTLOADER_BOOT_OF      BUTTON_VOL_UP
+
 #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
 #define BOOTLOADER_BOOT_OF      BUTTON_LEFT
 
@@ -603,7 +606,7 @@ void* main(void)
         }
 #endif
 
-#if defined(PHILIPS_HDD1630)
+#if defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330)
         printf("Trying /System/OF.ebn");
         rc=load_mi4(loadbuffer, "/System/OF.ebn", MAX_LOADSIZE);
         if (rc < EOK) {