summaryrefslogtreecommitdiffstats
path: root/firmware/kernel.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2008-12-08 23:31:05 +0000
committerMichael Sevakis <jethead71@rockbox.org>2008-12-08 23:31:05 +0000
commitcb0610802495d2f767c78a0b07a0b8359238f590 (patch)
treeecf223f8233cedb90ee5ad055cab1b4bdd2c9ee8 /firmware/kernel.c
parentea929a3e4547e9c709560803d2cea760ffe3e6a3 (diff)
downloadrockbox-cb0610802495d2f767c78a0b07a0b8359238f590.tar.gz
rockbox-cb0610802495d2f767c78a0b07a0b8359238f590.zip
Meg-FX: Enable a real tick in the bootloader. Do cleanups before switching to firmware and cache handling. Put proper main return address in lr.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19368 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/kernel.c')
-rw-r--r--firmware/kernel.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/firmware/kernel.c b/firmware/kernel.c
index 730484ed51..920893818a 100644
--- a/firmware/kernel.c
+++ b/firmware/kernel.c
@@ -244,10 +244,7 @@ void timeout_register(struct timeout *tmo, timeout_cb_type callback,
****************************************************************************/
void sleep(int ticks)
{
-#if CONFIG_CPU == S3C2440 && defined(BOOTLOADER)
- extern void delay(int ticks);
- delay(ticks);
-#elif defined(CPU_PP) && defined(BOOTLOADER)
+#if defined(CPU_PP) && defined(BOOTLOADER)
unsigned stop = USEC_TIMER + ticks * (1000000/HZ);
while (TIME_BEFORE(USEC_TIMER, stop))
switch_thread();
@@ -265,7 +262,7 @@ void sleep(int ticks)
void yield(void)
{
-#if ((CONFIG_CPU == S3C2440 || defined(ELIO_TPJ1022)) && defined(BOOTLOADER))
+#if ((defined(ELIO_TPJ1022)) && defined(BOOTLOADER))
/* Some targets don't like yielding in the bootloader */
#else
switch_thread();