1st/2nd gen bootloader: * Don't be verbose by default anymore. * Don't enable the backlight, as it looks bad in a bright environment due to backlight inversion, and it needs a lot of power.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14678 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 4 insertions, 3 deletions

diff --git a/bootloader/common.c b/bootloader/common.c
index d3e0f44063..2ec83fdd13 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -30,8 +30,8 @@
 
 /* TODO: Other bootloaders need to be adjusted to set this variable to true
    on a button press - currently only the ipod, H10 and Sansa versions do. */
-#if (defined(IPOD_ARCH) && !defined(IPOD_1G2G)) || defined(IRIVER_H10) \
- || defined(IRIVER_H10_5GB) ||  defined(SANSA_E200) || defined(GIGABEAT_F)
+#if defined(IPOD_ARCH) || defined(IRIVER_H10)  || defined(IRIVER_H10_5GB) \
+ || defined(SANSA_E200) || defined(GIGABEAT_F)
 bool verbose = false;
 #else
 bool verbose = true;
diff --git a/bootloader/ipod.c b/bootloader/ipod.c
index d308e3e9c5..441bda860c 100644
--- a/bootloader/ipod.c
+++ b/bootloader/ipod.c
@@ -237,9 +237,10 @@ void* main(void)
        reset the settings in rockbox. */
     button_was_held = button_hold();
 
+#ifndef HAVE_BACKLIGHT_INVERSION
     /* Turn on the backlight */
-
     __backlight_on();
+#endif
 
     system_init();
     kernel_init();