summaryrefslogtreecommitdiff
path: root/bootloader/main.c
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2007-01-13 09:08:18 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2007-01-13 09:08:18 +0000
commit20171c181fb97475b0ec8fd54eb9e0e461229994 (patch)
tree2e355408f04d0fa592d059bf43dc8e06d528222a /bootloader/main.c
parent886c302d0030e19238b5b8ec146b84d30cd7538b (diff)
downloadrockbox-20171c181fb97475b0ec8fd54eb9e0e461229994.tar.gz
rockbox-20171c181fb97475b0ec8fd54eb9e0e461229994.zip
Fixed the bootloader for H100 also.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11997 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader/main.c')
-rw-r--r--bootloader/main.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/bootloader/main.c b/bootloader/main.c
index 32b236c1b5..fd878ac5f6 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -589,13 +589,19 @@ void main(void)
589 /* Power on the hard drive early, to speed up the loading. 589 /* Power on the hard drive early, to speed up the loading.
590 Some H300 don't like this, so we only do it for the H100 */ 590 Some H300 don't like this, so we only do it for the H100 */
591#ifndef IRIVER_H300_SERIES 591#ifndef IRIVER_H300_SERIES
592 if (!hold_status && !recovery_mode) 592 if (!hold_status
593# ifdef HAVE_EEPROM_SETTINGS
594 && !recovery_mode
595# endif
596 )
593 { 597 {
594 ide_power_enable(true); 598 ide_power_enable(true);
595 } 599 }
596 600
601# ifdef EEPROM_SETTINGS
597 if (!hold_status && !usb_detect() && !recovery_mode) 602 if (!hold_status && !usb_detect() && !recovery_mode)
598 try_flashboot(); 603 try_flashboot();
604# endif
599#endif 605#endif
600 606
601 backlight_init(); 607 backlight_init();
@@ -622,7 +628,11 @@ void main(void)
622 628
623 /* Don't start if the Hold button is active on the device you 629 /* Don't start if the Hold button is active on the device you
624 are starting with */ 630 are starting with */
625 if (!usb_detect() && (hold_status || recovery_mode)) 631 if (!usb_detect() && (hold_status
632#ifdef HAVE_EEPROM_SETTINGS
633 || recovery_mode
634#endif
635 ))
626 { 636 {
627 if (detect_original_firmware()) 637 if (detect_original_firmware())
628 { 638 {
@@ -630,7 +640,7 @@ void main(void)
630 shutdown(); 640 shutdown();
631 } 641 }
632 642
633#ifdef IRIVER_H100_SERIES 643#ifdef HAVE_EEPROM_SETTINGS
634 failsafe_menu(); 644 failsafe_menu();
635#endif 645#endif
636 } 646 }