diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 | 
| commit | b706d63559aeec352bc72dd86d7d5423c15f6a60 (patch) | |
| tree | fdeda4d61970fef239d9d66ecd851fa46cfe5ec0 /post/cpu/ppc4xx/cache.c | |
| parent | c8603cfbd4573379a6076c9c208545ba2bbf019a (diff) | |
| parent | 594e79838ce5078a90d0c27abb2b2d61d5f8e8a7 (diff) | |
| download | olio-uboot-2014.01-b706d63559aeec352bc72dd86d7d5423c15f6a60.tar.xz olio-uboot-2014.01-b706d63559aeec352bc72dd86d7d5423c15f6a60.zip | |
Merge with git://www.denx.de/git/u-boot.git
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 e1f989ed9..109ca1fbd 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 (); |