diff options
author | Andrew Ryabinin <ryabinin.a.a@gmail.com> | 2012-01-03 15:01:16 +0000 |
---|---|---|
committer | Andrew Ryabinin <ryabinin.a.a@gmail.com> | 2012-01-03 15:01:16 +0000 |
commit | 40786042df12b2297161ca986b431d64a5df56db (patch) | |
tree | ad69ccee1b549d660ce0370bd6381976de86de1d | |
parent | 30c4efcd16ad00f4ee108856f99967df80be1caf (diff) | |
download | rockbox-40786042df12b2297161ca986b431d64a5df56db.tar.gz rockbox-40786042df12b2297161ca986b431d64a5df56db.zip |
rk27xx: Fix cache broken in r31339. Remove deprecated aliases.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31537 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/rk27xx/system-rk27xx.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/system-target.h | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/firmware/target/arm/rk27xx/system-rk27xx.c b/firmware/target/arm/rk27xx/system-rk27xx.c index 3349f9d0f1..ac423955d6 100644 --- a/firmware/target/arm/rk27xx/system-rk27xx.c +++ b/firmware/target/arm/rk27xx/system-rk27xx.c | |||
@@ -177,6 +177,7 @@ void commit_discard_idcache(void) | |||
177 | /* wait for invalidate process to complete */ | 177 | /* wait for invalidate process to complete */ |
178 | while (CACHEOP & 0x03); | 178 | while (CACHEOP & 0x03); |
179 | } | 179 | } |
180 | void commit_discard_dcache (void) __attribute__((alias("commit_discard_idcache"))); | ||
180 | 181 | ||
181 | void commit_discard_dcache_range (const void *base, unsigned int size) | 182 | void commit_discard_dcache_range (const void *base, unsigned int size) |
182 | { | 183 | { |
@@ -193,6 +194,3 @@ void commit_discard_dcache_range (const void *base, unsigned int size) | |||
193 | opcode += 32; | 194 | opcode += 32; |
194 | } | 195 | } |
195 | } | 196 | } |
196 | |||
197 | void commit_dcache_range(const void *base, unsigned int size) | ||
198 | __attribute__((alias("commit_discard_dcache_range"))); | ||
diff --git a/firmware/target/arm/rk27xx/system-target.h b/firmware/target/arm/rk27xx/system-target.h index 49f1a281cc..730686549d 100644 --- a/firmware/target/arm/rk27xx/system-target.h +++ b/firmware/target/arm/rk27xx/system-target.h | |||
@@ -40,15 +40,13 @@ static inline void core_sleep(void) | |||
40 | /* SCU_CPUPD = 0xdeedbabe; */ | 40 | /* SCU_CPUPD = 0xdeedbabe; */ |
41 | } | 41 | } |
42 | 42 | ||
43 | #define HAVE_CPUCACHE_COMMIT_DISCARD | ||
44 | /* deprecated alias */ | ||
45 | #define HAVE_CPUCACHE_INVALIDATE | ||
46 | |||
47 | /* Write DCache back to RAM for the given range and remove cache lines | 43 | /* Write DCache back to RAM for the given range and remove cache lines |
48 | * from DCache afterwards */ | 44 | * from DCache afterwards */ |
49 | void commit_discard_dcache_range(const void *base, unsigned int size); | 45 | void commit_discard_dcache_range(const void *base, unsigned int size); |
50 | /* deprecated alias */ | 46 | |
51 | void invalidate_dcache_range(const void *base, unsigned int size); | 47 | static inline void commit_dcache(void) {} |
48 | void commit_discard_dcache(void); | ||
49 | void commit_discard_idcache(void); | ||
52 | 50 | ||
53 | #define CPUFREQ_NORMAL 200000000 | 51 | #define CPUFREQ_NORMAL 200000000 |
54 | #define CPUFREQ_MAX 200000000 | 52 | #define CPUFREQ_MAX 200000000 |