| Message ID | 1373005766-27186-1-git-send-email-prabhakar@freescale.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | Andy Fleming |
| Headers | show |
On Fri, Jul 05, 2013 at 11:59:26AM +0530, Prabhakar Kushwaha wrote: > 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 <prabhakar@freescale.com> Applied, thanks! Andy
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c index 837c034..42a6951 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
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 <prabhakar@freescale.com> --- changes for v2: Removed checkpatch warning changes for v3: Incorporated Scott's comments -Took care of all possible use case arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)