diff options
-rw-r--r-- | bootloader/ipod.c | 7 | ||||
-rw-r--r-- | bootloader/ipodnano2g.c | 4 | ||||
-rw-r--r-- | bootloader/iriver_h1x0.c | 7 | ||||
-rw-r--r-- | utils/atj2137/adfuload/test_binary/lcm/test_lcm.c | 7 |
4 files changed, 11 insertions, 14 deletions
diff --git a/bootloader/ipod.c b/bootloader/ipod.c index 8e5bd08a42..9583afe0fb 100644 --- a/bootloader/ipod.c +++ b/bootloader/ipod.c | |||
@@ -306,12 +306,11 @@ void* main(void) | |||
306 | system_init(); | 306 | system_init(); |
307 | kernel_init(); | 307 | kernel_init(); |
308 | 308 | ||
309 | #ifndef HAVE_BACKLIGHT_INVERSION | ||
310 | backlight_init(); /* Turns on the backlight */ | ||
311 | #endif | ||
312 | |||
313 | lcd_init(); | 309 | lcd_init(); |
314 | font_init(); | 310 | font_init(); |
311 | #ifndef HAVE_BACKLIGHT_INVERSION | ||
312 | backlight_init(); /* Turns on the backlight BUGFIX backlight_init MUST BE AFTER lcd_init */ | ||
313 | #endif | ||
315 | 314 | ||
316 | #ifdef HAVE_LCD_COLOR | 315 | #ifdef HAVE_LCD_COLOR |
317 | lcd_set_foreground(LCD_WHITE); | 316 | lcd_set_foreground(LCD_WHITE); |
diff --git a/bootloader/ipodnano2g.c b/bootloader/ipodnano2g.c index 85bb2df86d..23a3557ae2 100644 --- a/bootloader/ipodnano2g.c +++ b/bootloader/ipodnano2g.c | |||
@@ -184,11 +184,11 @@ void main(void) | |||
184 | 184 | ||
185 | enable_irq(); | 185 | enable_irq(); |
186 | 186 | ||
187 | backlight_init(); /* Turns on the backlight */ | ||
188 | |||
189 | lcd_init(); | 187 | lcd_init(); |
190 | font_init(); | 188 | font_init(); |
191 | 189 | ||
190 | backlight_init(); /* Turns on backlight -- BUGFIX backlight_init MUST BE AFTER lcd_init */ | ||
191 | |||
192 | lcd_set_foreground(LCD_WHITE); | 192 | lcd_set_foreground(LCD_WHITE); |
193 | lcd_set_background(LCD_BLACK); | 193 | lcd_set_background(LCD_BLACK); |
194 | lcd_clear_display(); | 194 | lcd_clear_display(); |
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c index 8fd95d048c..f79c7c9aaf 100644 --- a/bootloader/iriver_h1x0.c +++ b/bootloader/iriver_h1x0.c | |||
@@ -485,14 +485,13 @@ void main(void) | |||
485 | try_flashboot(); | 485 | try_flashboot(); |
486 | # endif | 486 | # endif |
487 | 487 | ||
488 | backlight_init(); | ||
489 | |||
490 | |||
491 | lcd_init(); | 488 | lcd_init(); |
492 | 489 | ||
493 | if (!rc_on_button) | 490 | if (!rc_on_button) |
494 | lcd_remote_init(); | 491 | lcd_remote_init(); |
495 | 492 | ||
493 | backlight_init(); /* BUGFIX backlight_init MUST BE AFTER lcd_init */ | ||
494 | |||
496 | /* Bootloader uses simplified backlight thread, so we need to enable | 495 | /* Bootloader uses simplified backlight thread, so we need to enable |
497 | remote display here. */ | 496 | remote display here. */ |
498 | if (remote_detect()) | 497 | if (remote_detect()) |
diff --git a/utils/atj2137/adfuload/test_binary/lcm/test_lcm.c b/utils/atj2137/adfuload/test_binary/lcm/test_lcm.c index f795ccd1d0..581cefd3b0 100644 --- a/utils/atj2137/adfuload/test_binary/lcm/test_lcm.c +++ b/utils/atj2137/adfuload/test_binary/lcm/test_lcm.c | |||
@@ -280,14 +280,13 @@ int main(void) | |||
280 | /* unmask T0 source in INTC */ | 280 | /* unmask T0 source in INTC */ |
281 | INTC_MSK |= (1<<10); | 281 | INTC_MSK |= (1<<10); |
282 | 282 | ||
283 | lcm_init(); | ||
284 | lcd_init(); | ||
283 | backlight_init(); | 285 | backlight_init(); |
284 | 286 | ||
285 | /* copy rb logo image */ | 287 | /* copy rb logo image */ |
286 | for (i=0; i<240*74; i++) | 288 | for (i=0; i<240*74; i++) |
287 | framebuffer[i] = rockboxlogo[i]; | 289 | framebuffer[i] = rockboxlogo[i]; |
288 | |||
289 | lcm_init(); | ||
290 | lcd_init(); | ||
291 | lcd_update_rect(0,0,240,74); | 290 | lcd_update_rect(0,0,240,74); |
292 | 291 | ||
293 | /* ADEC_N63.BIN seems to setup P_CLK as 7.5MHz which is timer clk */ | 292 | /* ADEC_N63.BIN seems to setup P_CLK as 7.5MHz which is timer clk */ |