rk27xx: Fix cache broken in r31339. Remove deprecated aliases.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31537 a1c6a512-1295-4272-9138-f99709370657

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)
     /* wait for invalidate process to complete */
     while (CACHEOP & 0x03);   
 }
+void commit_discard_dcache (void) __attribute__((alias("commit_discard_idcache")));
 
 void commit_discard_dcache_range (const void *base, unsigned int size)
 {
@@ -193,6 +194,3 @@ void commit_discard_dcache_range (const void *base, unsigned int size)
         opcode += 32;
     }
 }
-
-void commit_dcache_range(const void *base, unsigned int size)
-    __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)
     /* SCU_CPUPD = 0xdeedbabe; */
 }
 
-#define HAVE_CPUCACHE_COMMIT_DISCARD
-/* deprecated alias */
-#define HAVE_CPUCACHE_INVALIDATE
-
 /* Write DCache back to RAM for the given range and remove cache lines
  * from DCache afterwards */
 void commit_discard_dcache_range(const void *base, unsigned int size);
-/* deprecated alias */
-void invalidate_dcache_range(const void *base, unsigned int size);
+
+static inline void commit_dcache(void) {}
+void commit_discard_dcache(void);
+void commit_discard_idcache(void);
 
 #define CPUFREQ_NORMAL 200000000
 #define CPUFREQ_MAX    200000000