summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrabhakar Kushwaha <prabhakar@freescale.com>2013-07-05 11:59:26 +0530
committerAndy Fleming <afleming@freescale.com>2013-07-16 17:44:30 -0500
commit2a6936059a1f393d828274bf5d33dd54c0a3c882 (patch)
treeaddd8582171cfe68b87d3ee496d1e214b2d706aa
parentb9944a77f909e343f930dcbcc597224e65dfcca9 (diff)
downloadtalos-obmc-uboot-2a6936059a1f393d828274bf5d33dd54c0a3c882.tar.gz
talos-obmc-uboot-2a6936059a1f393d828274bf5d33dd54c0a3c882.zip
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 <prabhakar@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
-rw-r--r--arch/powerpc/cpu/mpc85xx/cpu_init_early.c4
1 files changed, 3 insertions, 1 deletions
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
OpenPOWER on IntegriCloud