From 6a67707b5ec3b2c649c401550bb7fdef2b7c8d07 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 17 Dec 2011 07:27:24 +0000 Subject: Commit to certain names for cache coherency APIs and discard the aliases. Wouldn't surprise me a bit to get some non-green. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31339 a1c6a512-1295-4272-9138-f99709370657 --- bootloader/gigabeat-s.c | 2 +- bootloader/gigabeat.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bootloader') diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c index 223d839..8483170 100644 --- a/bootloader/gigabeat-s.c +++ b/bootloader/gigabeat-s.c @@ -324,7 +324,7 @@ static void NORETURN_ATTR handle_firmware_load(void) if (rc == EOK) { - cpucache_commit_discard(); + commit_discard_idcache(); asm volatile ("bx %0": : "r"(start_addr)); } diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c index cfba4bb..fb03f0e 100644 --- a/bootloader/gigabeat.c +++ b/bootloader/gigabeat.c @@ -195,7 +195,7 @@ void main(void) printf("Loading firmware"); /* Flush out anything pending first */ - cpucache_invalidate(); + commit_discard_idcache(); loadbuffer = (unsigned char*) 0x31000000; buffer_size = (unsigned char*)0x31400000 - loadbuffer; @@ -209,7 +209,7 @@ void main(void) if (rc == EOK) { - cpucache_invalidate(); + commit_discard_idcache(); kernel_entry = (void*) loadbuffer; rc = kernel_entry(); } -- cgit v1.1