85xx: Use CONFIG_SYS_CACHELINE_SIZE instead of magic number
authorKumar Gala <galak@kernel.crashing.org>
Thu, 23 Oct 2008 06:47:37 +0000 (01:47 -0500)
committerAndrew Fleming-AFLEMING <afleming@freescale.com>
Fri, 24 Oct 2008 20:10:23 +0000 (15:10 -0500)
Using CONFIG_SYS_CACHELINE_SIZE instead of 31 means we can handle
e500mc's 64-byte cacheline properly when it gets added.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
cpu/mpc85xx/start.S

index fc3c336..f16d4c0 100644 (file)
@@ -998,8 +998,8 @@ trap_reloc:
 .globl unlock_ram_in_cache
 unlock_ram_in_cache:
        /* invalidate the INIT_RAM section */
-       lis     r3,(CONFIG_SYS_INIT_RAM_ADDR & ~31)@h
-       ori     r3,r3,(CONFIG_SYS_INIT_RAM_ADDR & ~31)@l
+       lis     r3,(CONFIG_SYS_INIT_RAM_ADDR & ~(CONFIG_SYS_CACHELINE_SIZE-1))@h
+       ori     r3,r3,(CONFIG_SYS_INIT_RAM_ADDR & ~(CONFIG_SYS_CACHELINE_SIZE-1))@l
        mfspr   r4,L1CFG0
        andi.   r4,r4,0x1ff
        slwi    r4,r4,(10 - 1 - L1_CACHE_SHIFT)