summaryrefslogtreecommitdiffstats
path: root/bootloader
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
parent886c302d0030e19238b5b8ec146b84d30cd7538b (diff)
downloadrockbox-20171c181fb97475b0ec8fd54eb9e0e461229994.tar.gz
rockbox-20171c181fb97475b0ec8fd54eb9e0e461229994.tar.bz2
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')
-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)
/* Power on the hard drive early, to speed up the loading.
Some H300 don't like this, so we only do it for the H100 */
#ifndef IRIVER_H300_SERIES
- if (!hold_status && !recovery_mode)
+ if (!hold_status
+# ifdef HAVE_EEPROM_SETTINGS
+ && !recovery_mode
+# endif
+ )
{
ide_power_enable(true);
}
+# ifdef EEPROM_SETTINGS
if (!hold_status && !usb_detect() && !recovery_mode)
try_flashboot();
+# endif
#endif
backlight_init();
@@ -622,7 +628,11 @@ void main(void)
/* Don't start if the Hold button is active on the device you
are starting with */
- if (!usb_detect() && (hold_status || recovery_mode))
+ if (!usb_detect() && (hold_status
+#ifdef HAVE_EEPROM_SETTINGS
+ || recovery_mode
+#endif
+ ))
{
if (detect_original_firmware())
{
@@ -630,7 +640,7 @@ void main(void)
shutdown();
}
-#ifdef IRIVER_H100_SERIES
+#ifdef HAVE_EEPROM_SETTINGS
failsafe_menu();
#endif
}