diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-31 10:26:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-31 10:26:14 -0400 |
| commit | da6e2fab5db000e31187aa4c9495c244011792c1 (patch) | |
| tree | 6ae6a6ce2ad21c15e0cc560275f676e2aeb42767 /arch/mips/lib/cache_init.S | |
| parent | 653bb0d92eefb7255c88a8a251a3dbabec9345b6 (diff) | |
| parent | f1b65c98b0a134ce92c38141b917fd3a210ee535 (diff) | |
| download | talos-obmc-uboot-da6e2fab5db000e31187aa4c9495c244011792c1.tar.gz talos-obmc-uboot-da6e2fab5db000e31187aa4c9495c244011792c1.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch/mips/lib/cache_init.S')
| -rw-r--r-- | arch/mips/lib/cache_init.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/lib/cache_init.S b/arch/mips/lib/cache_init.S index 08b7c3af52..bc8ab27b58 100644 --- a/arch/mips/lib/cache_init.S +++ b/arch/mips/lib/cache_init.S @@ -99,16 +99,16 @@ * */ LEAF(mips_cache_reset) -#ifdef CONFIG_SYS_ICACHE_SIZE +#ifndef CONFIG_SYS_CACHE_SIZE_AUTO li t2, CONFIG_SYS_ICACHE_SIZE - li t8, CONFIG_SYS_CACHELINE_SIZE + li t8, CONFIG_SYS_ICACHE_LINE_SIZE #else l1_info t2, t8, MIPS_CONF1_IA_SHF #endif -#ifdef CONFIG_SYS_DCACHE_SIZE +#ifndef CONFIG_SYS_CACHE_SIZE_AUTO li t3, CONFIG_SYS_DCACHE_SIZE - li t9, CONFIG_SYS_CACHELINE_SIZE + li t9, CONFIG_SYS_DCACHE_LINE_SIZE #else l1_info t3, t9, MIPS_CONF1_DA_SHF #endif @@ -116,7 +116,7 @@ LEAF(mips_cache_reset) #ifdef CONFIG_SYS_MIPS_CACHE_INIT_RAM_LOAD /* Determine the largest L1 cache size */ -#if defined(CONFIG_SYS_ICACHE_SIZE) && defined(CONFIG_SYS_DCACHE_SIZE) +#ifndef CONFIG_SYS_CACHE_SIZE_AUTO #if CONFIG_SYS_ICACHE_SIZE > CONFIG_SYS_DCACHE_SIZE li v0, CONFIG_SYS_ICACHE_SIZE #else |
