diff options
author | Michal Simek <monstr@monstr.eu> | 2007-08-15 21:06:52 +0200 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2007-08-15 21:06:52 +0200 |
commit | 19909edb97140a5ea3139705589bb90e023ab5e1 (patch) | |
tree | 6629766d2355d3c01b96b0c5ee6b9fd73502c943 /post/cpu/ppc4xx/cache.c | |
parent | d1ed28cf36ab6b1d4c479809de7252bf53d2f2d4 (diff) | |
parent | 210f463c71917b7a4495c2103c228b9c179ae64d (diff) | |
download | u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.zip u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.tar.gz u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.tar.bz2 |
Merge git://www.denx.de/git/u-boot into merge
Diffstat (limited to 'post/cpu/ppc4xx/cache.c')
-rw-r--r-- | post/cpu/ppc4xx/cache.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/post/cpu/ppc4xx/cache.c b/post/cpu/ppc4xx/cache.c index e1f989e..109ca1f 100644 --- a/post/cpu/ppc4xx/cache.c +++ b/post/cpu/ppc4xx/cache.c @@ -53,14 +53,25 @@ int cache_post_test6 (int tlb, void *p, int size); static int tlb = -1; /* index to the victim TLB entry */ +#ifdef CONFIG_440 static unsigned char testarea[CACHE_POST_SIZE] __attribute__((__aligned__(CACHE_POST_SIZE))); +#endif int cache_post_test (int flags) { void* virt = (void*)CFG_POST_CACHE_ADDR; - int ints, i, res = 0; - u32 word0; + int ints; + int res = 0; + + /* + * All 44x variants deal with cache management differently + * because they have the address translation always enabled. + * The 40x ppc's don't use address translation in U-Boot at all, + * so we have to distinguish here between 40x and 44x. + */ +#ifdef CONFIG_440 + int word0, i; if (tlb < 0) { /* @@ -83,6 +94,7 @@ int cache_post_test (int flags) } } } +#endif ints = disable_interrupts (); WATCHDOG_RESET (); |