diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-08-03 19:00:29 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-08-03 19:00:29 +0000 |
commit | 851be21f671feb0bf41e1dcaaced4d7e2e5cf72c (patch) | |
tree | bb3e63faa8b858626dc627f481da4fccc515207c | |
parent | 29b2a049de5c6a81c99ef3a2fb9b0e5fce57b86d (diff) | |
download | rockbox-851be21f671feb0bf41e1dcaaced4d7e2e5cf72c.tar.gz rockbox-851be21f671feb0bf41e1dcaaced4d7e2e5cf72c.zip |
system-arm.c/__div0 are for ARM native builds only
Android can now be built with CPU_ARM defined
Needs investigation (and test_codec) to see if/how this helps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27684 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs.c | 2 | ||||
-rw-r--r-- | apps/codecs.h | 2 | ||||
-rw-r--r-- | apps/plugin.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 2 | ||||
-rw-r--r-- | firmware/SOURCES | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/apps/codecs.c b/apps/codecs.c index 29a664425a..9e77dd9099 100644 --- a/apps/codecs.c +++ b/apps/codecs.c | |||
@@ -119,7 +119,7 @@ struct codec_api ci = { | |||
119 | NULL, /* configure */ | 119 | NULL, /* configure */ |
120 | 120 | ||
121 | /* kernel/ system */ | 121 | /* kernel/ system */ |
122 | #ifdef CPU_ARM | 122 | #if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE |
123 | __div0, | 123 | __div0, |
124 | #endif | 124 | #endif |
125 | PREFIX(sleep), | 125 | PREFIX(sleep), |
diff --git a/apps/codecs.h b/apps/codecs.h index 7e4fe948c2..97b33ec9ad 100644 --- a/apps/codecs.h +++ b/apps/codecs.h | |||
@@ -156,7 +156,7 @@ struct codec_api { | |||
156 | void (*configure)(int setting, intptr_t value); | 156 | void (*configure)(int setting, intptr_t value); |
157 | 157 | ||
158 | /* kernel/ system */ | 158 | /* kernel/ system */ |
159 | #ifdef CPU_ARM | 159 | #if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE |
160 | void (*__div0)(void); | 160 | void (*__div0)(void); |
161 | #endif | 161 | #endif |
162 | void (*sleep)(int ticks); | 162 | void (*sleep)(int ticks); |
diff --git a/apps/plugin.c b/apps/plugin.c index b3baea757c..cc540cd988 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -345,7 +345,7 @@ static const struct plugin_api rockbox_api = { | |||
345 | dir_exists, | 345 | dir_exists, |
346 | 346 | ||
347 | /* kernel/ system */ | 347 | /* kernel/ system */ |
348 | #ifdef CPU_ARM | 348 | #if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE |
349 | __div0, | 349 | __div0, |
350 | #endif | 350 | #endif |
351 | PREFIX(sleep), | 351 | PREFIX(sleep), |
diff --git a/apps/plugin.h b/apps/plugin.h index 5ee18d0078..624b7039b8 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -450,7 +450,7 @@ struct plugin_api { | |||
450 | bool (*dir_exists)(const char *path); | 450 | bool (*dir_exists)(const char *path); |
451 | 451 | ||
452 | /* kernel/ system */ | 452 | /* kernel/ system */ |
453 | #ifdef CPU_ARM | 453 | #if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE |
454 | void (*__div0)(void); | 454 | void (*__div0)(void); |
455 | #endif | 455 | #endif |
456 | void (*sleep)(int ticks); | 456 | void (*sleep)(int ticks); |
diff --git a/firmware/SOURCES b/firmware/SOURCES index 4092f71e04..f27a7dd140 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -448,7 +448,9 @@ target/arm/memset16-arm.S | |||
448 | #ifdef HAVE_PRIORITY_SCHEDULING | 448 | #ifdef HAVE_PRIORITY_SCHEDULING |
449 | target/arm/ffs-arm.S | 449 | target/arm/ffs-arm.S |
450 | #endif | 450 | #endif |
451 | #if CONFIG_PLATFORM & PLATFORM_NATIVE | ||
451 | target/arm/system-arm.c | 452 | target/arm/system-arm.c |
453 | #endif | ||
452 | #if CONFIG_I2C == I2C_PP5024 || CONFIG_I2C == I2C_PP5020 || CONFIG_I2C == I2C_PP5002 | 454 | #if CONFIG_I2C == I2C_PP5024 || CONFIG_I2C == I2C_PP5020 || CONFIG_I2C == I2C_PP5002 |
453 | target/arm/i2c-pp.c | 455 | target/arm/i2c-pp.c |
454 | #elif CONFIG_I2C == I2C_PNX0101 | 456 | #elif CONFIG_I2C == I2C_PNX0101 |