2 files changed, 9 insertions, 0 deletions

diff --git a/firmware/target/coldfire/iaudio/x5/backlight-x5.c b/firmware/target/coldfire/iaudio/x5/backlight-x5.c
index 667f4e7278..ebb28fbf2b 100644
--- a/firmware/target/coldfire/iaudio/x5/backlight-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/backlight-x5.c
@@ -36,7 +36,9 @@ void _backlight_on(void)
 {
     int level;
     lcd_enable(true);
+#ifndef BOOTLOADER
     _lcd_sleep_timer = 0; /* LCD should be awake already */
+#endif
     level = set_irq_level(HIGHEST_IRQ_LEVEL);
     pcf50606_write(0x38, 0xb0); /* Backlight ON, GPO1INV=1, GPO1ACT=011 */
     set_irq_level(level);
@@ -48,6 +50,7 @@ void _backlight_off(void)
     pcf50606_write(0x38, 0x80); /* Backlight OFF, GPO1INV=1, GPO1ACT=000 */
     set_irq_level(level);
     lcd_enable(false);
+#ifndef BOOTLOADER
     /* Start LCD sleep countdown */
     if (_lcd_sleep_timeout < 0)
     {
@@ -56,6 +59,7 @@ void _backlight_off(void)
     }
     else
         _lcd_sleep_timer = _lcd_sleep_timeout;
+#endif
 }
 
 /* set brightness by changing the PWM */
diff --git a/firmware/target/coldfire/iriver/h100/backlight-target.h b/firmware/target/coldfire/iriver/h100/backlight-target.h
index 6697fb19c3..81ad2e0f6c 100644
--- a/firmware/target/coldfire/iriver/h100/backlight-target.h
+++ b/firmware/target/coldfire/iriver/h100/backlight-target.h
@@ -23,11 +23,16 @@ bool _backlight_init(void); /* Returns backlight current state (true=ON). */
 void _backlight_hw_on(void);
 void _backlight_hw_off(void);
 
+#ifdef BOOTLOADER
+#define _backlight_on() _backlight_hw_on()
+#define _backlight_off() _backlight_hw_off()
+#else
 #define _backlight_on_isr() _backlight_hw_on()
 #define _backlight_off_isr() _backlight_hw_off()
 #define _backlight_on_normal() _backlight_hw_on()
 #define _backlight_off_normal() _backlight_hw_off()
 #define _BACKLIGHT_FADE_BOOST
+#endif
 
 void _remote_backlight_on(void);
 void _remote_backlight_off(void);