From: Prabhakar Kushwaha Date: Fri, 5 Jul 2013 06:29:26 +0000 (+0530) Subject: powerpc/mpc85xx:Disable Debug TLB entry for non-minimal SPL X-Git-Tag: v2013.07~12 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=2a6936059a1f393d828274bf5d33dd54c0a3c882 powerpc/mpc85xx:Disable Debug TLB entry for non-minimal SPL CONFIG_SPL_BUILD creates debug TLB entry, so disable it before init_tlbs. CONFIG_SPL_INIT_MINIMAL never creates any debug TLB entry, so no need of disable_tlb(). Signed-off-by: Prabhakar Kushwaha Signed-off-by: Andy Fleming --- diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c index 837c034be9..3b3c82f846 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c @@ -180,7 +180,9 @@ void cpu_init_early_f(void) invalidate_tlb(1); -#if defined(CONFIG_SYS_PPC_E500_DEBUG_TLB) && !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NAND_SPL) +#if defined(CONFIG_SYS_PPC_E500_DEBUG_TLB) && \ + !(defined(CONFIG_SPL_INIT_MINIMAL) && defined(CONFIG_SPL_BUILD)) && \ + !defined(CONFIG_NAND_SPL) disable_tlb(CONFIG_SYS_PPC_E500_DEBUG_TLB); #endif