summaryrefslogtreecommitdiff
path: root/firmware/kernel.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2008-02-08 02:20:05 +0000
committerMichael Sevakis <jethead71@rockbox.org>2008-02-08 02:20:05 +0000
commita07c034de77e9159cf5d9501c75ea1f0165b6a13 (patch)
tree4a563faa46f15d67787759e66fa578a6da65273e /firmware/kernel.c
parent7667a865ff06565a2a7f91ccde0120cd2e0c977e (diff)
downloadrockbox-a07c034de77e9159cf5d9501c75ea1f0165b6a13.zip
rockbox-a07c034de77e9159cf5d9501c75ea1f0165b6a13.tar.gz
rockbox-a07c034de77e9159cf5d9501c75ea1f0165b6a13.tar.bz2
rockbox-a07c034de77e9159cf5d9501c75ea1f0165b6a13.tar.xz
Gigabeat S: Interrupt enabled bootloader. Miscellaneous integration changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16243 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 8eba565..835181f 100644
--- a/firmware/kernel.c
+++ b/firmware/kernel.c
@@ -24,9 +24,6 @@
#include "cpu.h"
#include "system.h"
#include "panic.h"
-#if CONFIG_CPU == IMX31L
-#include "avic-imx31.h"
-#endif
/* Make this nonzero to enable more elaborate checks on objects */
#ifdef DEBUG
@@ -42,7 +39,7 @@
#define KERNEL_ASSERT(exp, msg...) ({})
#endif
-#if (!defined(CPU_PP) && (CONFIG_CPU != IMX31L)) || !defined(BOOTLOADER)
+#if !defined(CPU_PP) || !defined(BOOTLOADER)
volatile long current_tick NOCACHEDATA_ATTR = 0;
#endif
@@ -107,7 +104,7 @@ void sleep(int ticks)
void yield(void)
{
-#if ((CONFIG_CPU == S3C2440 || defined(ELIO_TPJ1022) || CONFIG_CPU == IMX31L) && defined(BOOTLOADER))
+#if ((CONFIG_CPU == S3C2440 || defined(ELIO_TPJ1022)) && defined(BOOTLOADER))
/* Some targets don't like yielding in the bootloader */
#else
switch_thread(NULL);