diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2009-02-11 12:55:51 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2009-02-11 12:55:51 +0000 |
commit | 21f0c9a2829415f52b64cbdf965b01525e78f17a (patch) | |
tree | b5cb8021097722969f75784011c9f64f991c0c3d /bootloader | |
parent | 4cd7597172d916db9fc99bde4c03b669366f852a (diff) | |
download | rockbox-21f0c9a2829415f52b64cbdf965b01525e78f17a.tar.gz rockbox-21f0c9a2829415f52b64cbdf965b01525e78f17a.zip |
Make basic cache functions into calls, and get rid of CACHE_FUNCTION_WRAPPERS and CACHE_FUNCTIONS_AS_CALL macros. Rename flush/invalidate_icache to cpucache_flush/invalidate. They're inlined only if an implementation isn't provided by defining HAVE_CPUCACHE_FLUSH/INVALIDATE.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19971 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/gigabeat-s.c | 4 | ||||
-rw-r--r-- | bootloader/gigabeat.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c index cd3b1df545..2e95d4cf64 100644 --- a/bootloader/gigabeat-s.c +++ b/bootloader/gigabeat-s.c | |||
@@ -311,7 +311,7 @@ static void __attribute__((noreturn)) handle_firmware_load(void) | |||
311 | 311 | ||
312 | if (rc == EOK) | 312 | if (rc == EOK) |
313 | { | 313 | { |
314 | invalidate_icache(); | 314 | cpucache_invalidate(); |
315 | asm volatile ("bx %0": : "r"(start_addr)); | 315 | asm volatile ("bx %0": : "r"(start_addr)); |
316 | } | 316 | } |
317 | 317 | ||
@@ -332,7 +332,7 @@ void main(void) | |||
332 | int rc; | 332 | int rc; |
333 | 333 | ||
334 | /* Flush and invalidate all caches (because vectors were written) */ | 334 | /* Flush and invalidate all caches (because vectors were written) */ |
335 | invalidate_icache(); | 335 | cpucache_invalidate(); |
336 | 336 | ||
337 | system_init(); | 337 | system_init(); |
338 | kernel_init(); | 338 | kernel_init(); |
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c index a3732b0e06..23fedcc463 100644 --- a/bootloader/gigabeat.c +++ b/bootloader/gigabeat.c | |||
@@ -196,7 +196,7 @@ void main(void) | |||
196 | printf("Loading firmware"); | 196 | printf("Loading firmware"); |
197 | 197 | ||
198 | /* Flush out anything pending first */ | 198 | /* Flush out anything pending first */ |
199 | invalidate_icache(); | 199 | cpucache_invalidate(); |
200 | 200 | ||
201 | loadbuffer = (unsigned char*) 0x31000000; | 201 | loadbuffer = (unsigned char*) 0x31000000; |
202 | buffer_size = (unsigned char*)0x31400000 - loadbuffer; | 202 | buffer_size = (unsigned char*)0x31400000 - loadbuffer; |
@@ -210,7 +210,7 @@ void main(void) | |||
210 | 210 | ||
211 | if (rc == EOK) | 211 | if (rc == EOK) |
212 | { | 212 | { |
213 | invalidate_icache(); | 213 | cpucache_invalidate(); |
214 | kernel_entry = (void*) loadbuffer; | 214 | kernel_entry = (void*) loadbuffer; |
215 | rc = kernel_entry(); | 215 | rc = kernel_entry(); |
216 | } | 216 | } |