summaryrefslogtreecommitdiff
path: root/bootloader
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-12-17 07:27:24 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-12-17 07:27:24 +0000
commit6a67707b5ec3b2c649c401550bb7fdef2b7c8d07 (patch)
treebfe31942a4abbaac09ad0f4226effdcef8bf097e /bootloader
parent43d7a75369286dc3b39b858df34f66b0b45de34e (diff)
downloadrockbox-6a67707b5ec3b2c649c401550bb7fdef2b7c8d07.tar.gz
rockbox-6a67707b5ec3b2c649c401550bb7fdef2b7c8d07.zip
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
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/gigabeat-s.c2
-rw-r--r--bootloader/gigabeat.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index 223d839010..8483170522 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -324,7 +324,7 @@ static void NORETURN_ATTR handle_firmware_load(void)
324 324
325 if (rc == EOK) 325 if (rc == EOK)
326 { 326 {
327 cpucache_commit_discard(); 327 commit_discard_idcache();
328 asm volatile ("bx %0": : "r"(start_addr)); 328 asm volatile ("bx %0": : "r"(start_addr));
329 } 329 }
330 330
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c
index cfba4bb38d..fb03f0ea4d 100644
--- a/bootloader/gigabeat.c
+++ b/bootloader/gigabeat.c
@@ -195,7 +195,7 @@ void main(void)
195 printf("Loading firmware"); 195 printf("Loading firmware");
196 196
197 /* Flush out anything pending first */ 197 /* Flush out anything pending first */
198 cpucache_invalidate(); 198 commit_discard_idcache();
199 199
200 loadbuffer = (unsigned char*) 0x31000000; 200 loadbuffer = (unsigned char*) 0x31000000;
201 buffer_size = (unsigned char*)0x31400000 - loadbuffer; 201 buffer_size = (unsigned char*)0x31400000 - loadbuffer;
@@ -209,7 +209,7 @@ void main(void)
209 209
210 if (rc == EOK) 210 if (rc == EOK)
211 { 211 {
212 cpucache_invalidate(); 212 commit_discard_idcache();
213 kernel_entry = (void*) loadbuffer; 213 kernel_entry = (void*) loadbuffer;
214 rc = kernel_entry(); 214 rc = kernel_entry();
215 } 215 }