From 6e645cc4eb26baa27a4114774be9ea41296c036e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Thu, 6 Nov 2008 15:24:19 +0000 Subject: [PATCH] AS3525: we won't use threads in the bootloader Disable tick_start() Call kernel_init() _after_ system_init() git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19028 a1c6a512-1295-4272-9138-f99709370657 --- bootloader/sansa_as3525.c | 2 +- firmware/target/arm/as3525/kernel-as3525.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c index 2e0f6fe717..6340fbbc41 100644 --- a/bootloader/sansa_as3525.c +++ b/bootloader/sansa_as3525.c @@ -38,8 +38,8 @@ void main(void) int i; unsigned char buf[8]; - kernel_init(); system_init(); + kernel_init(); lcd_init(); diff --git a/firmware/target/arm/as3525/kernel-as3525.c b/firmware/target/arm/as3525/kernel-as3525.c index 08d6128bb7..73031b9eb5 100644 --- a/firmware/target/arm/as3525/kernel-as3525.c +++ b/firmware/target/arm/as3525/kernel-as3525.c @@ -32,6 +32,9 @@ void INT_TIMER2(void) void tick_start(unsigned int interval_in_ms) { +#ifdef BOOTLOADER + (void) interval_in_ms; +#else int phi = 0; /* prescaler bits */ int prescale = 1; int cycles = 64000 * interval_in_ms; /* pclk is clocked at 64MHz */ @@ -54,4 +57,5 @@ void tick_start(unsigned int interval_in_ms) /* /!\ bit 4 (reserved) must not be modified * periodic mode, interrupt enabled, 16 bits counter */ TIMER2_CONTROL = (TIMER2_CONTROL & (1<<4)) | 0xe0 | (phi<<2); +#endif }