Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 05:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm1136: move cache code from start.S to cache.c

Browse source 
arch/arm/cpu/arm1136/start.S contain a cache flushing function.
Remove the function and move its code into arch/arm/lib/cache.c.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
This commit is contained in:
Albert ARIBAUD 2014-04-15 16:13:47 +02:00
parent d2a3e91139
commit b4ee1491b9
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/cpu/arm1136/start.S
View file

@ -333,14 +333,4 @@ fiq:
bl do_fiq bl do_fiq
#endif #endif
.align 5
.global arm1136_cache_flush
arm1136_cache_flush:
#if !defined(CONFIG_SYS_ICACHE_OFF)
mcr p15, 0, r1, c7, c5, 0 @ invalidate I cache
#endif
#if !defined(CONFIG_SYS_DCACHE_OFF)
mcr p15, 0, r1, c7, c14, 0 @ invalidate D cache
#endif
mov pc, lr @ back to caller
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */

13
arch/arm/lib/cache.c
View file

@ -12,16 +12,23 @@
void __flush_cache(unsigned long start, unsigned long size) void __flush_cache(unsigned long start, unsigned long size)
{ {
#if defined(CONFIG_ARM1136) #if defined(CONFIG_ARM1136)
void arm1136_cache_flush(void);
arm1136_cache_flush(); #if !defined(CONFIG_SYS_ICACHE_OFF)
asm("mcr p15, 0, r1, c7, c5, 0"); /* invalidate I cache */
#endif #endif
#if !defined(CONFIG_SYS_DCACHE_OFF)
asm("mcr p15, 0, r1, c7, c14, 0"); /* Clean+invalidate D cache */
#endif
#endif /* CONFIG_ARM1136 */
#ifdef CONFIG_ARM926EJS #ifdef CONFIG_ARM926EJS
/* test and clean, page 2-23 of arm926ejs manual */ /* test and clean, page 2-23 of arm926ejs manual */
asm("0: mrc p15, 0, r15, c7, c10, 3\n\t" "bne 0b\n" : : : "memory"); asm("0: mrc p15, 0, r15, c7, c10, 3\n\t" "bne 0b\n" : : : "memory");
/* disable write buffer as well (page 2-22) */ /* disable write buffer as well (page 2-22) */
asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)); asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
#endif #endif /* CONFIG_ARM926EJS */
return; return;
} }
void flush_cache(unsigned long start, unsigned long size) void flush_cache(unsigned long start, unsigned long size)