diff options
author | Marcin Bukat <marcin.bukat@gmail.com> | 2010-10-22 12:11:58 +0000 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2010-10-22 12:11:58 +0000 |
commit | 38edf679f2e64e9c2730b50d8fde15401a14449b (patch) | |
tree | 9e0b1a5b6ac697c458dc24fe16a83ac6749178b3 | |
parent | c8dfe0508e176b87594f12a67467d51715f53a54 (diff) | |
download | rockbox-38edf679f2e64e9c2730b50d8fde15401a14449b.tar.gz rockbox-38edf679f2e64e9c2730b50d8fde15401a14449b.zip |
MPIO HD200 - squash long standing bug in bootloader which prevented booting OF if doing coldstart on battery only.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28324 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | bootloader/mpio_hd200.c | 9 | ||||
-rw-r--r-- | firmware/target/coldfire/mpio/hd200/adc-hd200.c | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/bootloader/mpio_hd200.c b/bootloader/mpio_hd200.c index 6f32d6b87c..31d9ee4018 100644 --- a/bootloader/mpio_hd200.c +++ b/bootloader/mpio_hd200.c | |||
@@ -319,15 +319,18 @@ void main(void) | |||
319 | /* this is default mode after power_init() */ | 319 | /* this is default mode after power_init() */ |
320 | bool high_current_charging = true; | 320 | bool high_current_charging = true; |
321 | 321 | ||
322 | /* setup GPIOs related to power functions */ | ||
322 | power_init(); | 323 | power_init(); |
323 | 324 | ||
324 | system_init(); | 325 | system_init(); |
325 | kernel_init(); | 326 | kernel_init(); |
326 | 327 | ||
328 | /* run at 45MHz */ | ||
327 | set_cpu_frequency(CPUFREQ_NORMAL); | 329 | set_cpu_frequency(CPUFREQ_NORMAL); |
328 | coldfire_set_pllcr_audio_bits(DEFAULT_PLLCR_AUDIO_BITS); | ||
329 | 330 | ||
331 | /* IRQs are needed by button driver */ | ||
330 | enable_irq(); | 332 | enable_irq(); |
333 | |||
331 | lcd_init(); | 334 | lcd_init(); |
332 | 335 | ||
333 | /* only lowlevel functions no queue init */ | 336 | /* only lowlevel functions no queue init */ |
@@ -337,8 +340,8 @@ void main(void) | |||
337 | /* setup font system*/ | 340 | /* setup font system*/ |
338 | font_init(); | 341 | font_init(); |
339 | lcd_setfont(FONT_SYSFIXED); | 342 | lcd_setfont(FONT_SYSFIXED); |
340 | 343 | ||
341 | /* buttons reading */ | 344 | /* buttons reading init*/ |
342 | adc_init(); | 345 | adc_init(); |
343 | button_init(); | 346 | button_init(); |
344 | 347 | ||
diff --git a/firmware/target/coldfire/mpio/hd200/adc-hd200.c b/firmware/target/coldfire/mpio/hd200/adc-hd200.c index 01b6f531e2..dd160ae0de 100644 --- a/firmware/target/coldfire/mpio/hd200/adc-hd200.c +++ b/firmware/target/coldfire/mpio/hd200/adc-hd200.c | |||
@@ -91,4 +91,7 @@ void adc_init(void) | |||
91 | 91 | ||
92 | /* create tick task which enables ADC interrupt */ | 92 | /* create tick task which enables ADC interrupt */ |
93 | tick_add_task(adc_tick); | 93 | tick_add_task(adc_tick); |
94 | |||
95 | /* let the interrupt handler fill readout array */ | ||
96 | sleep(2); | ||
94 | } | 97 | } |