summaryrefslogtreecommitdiff
path: root/bootloader
diff options
context:
space:
mode:
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/SOURCES3
-rw-r--r--bootloader/main-pp.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index f748403a85..459a1a27bf 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -11,7 +11,8 @@ gigabeat-s.c
11 defined(SANSA_E200) || defined(SANSA_C200) || \ 11 defined(SANSA_E200) || defined(SANSA_C200) || \
12 defined(MROBE_100) || defined(PHILIPS_SA9200) || \ 12 defined(MROBE_100) || defined(PHILIPS_SA9200) || \
13 defined(PHILIPS_HDD1630) || defined(SAMSUNG_YH820) || \ 13 defined(PHILIPS_HDD1630) || defined(SAMSUNG_YH820) || \
14 defined(SAMSUNG_YH920) || defined(SAMSUNG_YH925) 14 defined(SAMSUNG_YH920) || defined(SAMSUNG_YH925) || \
15 defined(SANSA_VIEW)
15#ifdef E200R_INSTALLER 16#ifdef E200R_INSTALLER
16main-e200r-installer.c 17main-e200r-installer.c
17#elif defined(C240_ERASE) 18#elif defined(C240_ERASE)
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c
index b79ca30ea4..c213a65121 100644
--- a/bootloader/main-pp.c
+++ b/bootloader/main-pp.c
@@ -73,6 +73,9 @@ extern int show_logo(void);
73#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 73#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
74#define BOOTLOADER_BOOT_OF BUTTON_LEFT 74#define BOOTLOADER_BOOT_OF BUTTON_LEFT
75 75
76#elif CONFIG_KEYPAD == SANSA_FUZE_PAD
77#define BOOTLOADER_BOOT_OF BUTTON_LEFT
78
76#endif 79#endif
77 80
78/* Maximum allowed firmware image size. 10MB is more than enough */ 81/* Maximum allowed firmware image size. 10MB is more than enough */
@@ -447,7 +450,8 @@ void* main(void)
447 int rc; 450 int rc;
448 int num_partitions; 451 int num_partitions;
449 struct partinfo* pinfo; 452 struct partinfo* pinfo;
450#if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200) 453#if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200) \
454 || defined (SANSA_VIEW)
451#if !defined(USE_ROCKBOX_USB) 455#if !defined(USE_ROCKBOX_USB)
452 int usb_retry = 0; 456 int usb_retry = 0;
453#endif 457#endif