85xx: Get ride of old TLB setup code

Now that all boards have been converted, remove old config code and the
config option for the new style.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

2 files changed, 0 insertions, 22 deletions

diff --git a/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c
index 4e2bfe73e9..c0ff1d5120 100644
--- a/cpu/mpc85xx/cpu_init.c
+++ b/cpu/mpc85xx/cpu_init.c
@@ -149,27 +149,7 @@ void cpu_init_early_f(void)
 
 	init_laws();
 	invalidate_tlb(0);
-#ifdef CONFIG_FSL_INIT_TLBS
 	init_tlbs();
-#else
-	{
-		extern u32 tlb1_entry;
-		u32 *tmp = &tlb1_entry;
-		int i;
-		int num = tmp[2];
-
-		/* skip to actual table */
-		tmp += 3;
-
-		for (i = 0; i < num; i++, tmp += 4) {
-			mtspr(MAS0, tmp[0]);
-			mtspr(MAS1, tmp[1]);
-			mtspr(MAS2, tmp[2]);
-			mtspr(MAS3, tmp[3]);
-			asm volatile("isync;msync;tlbwe;isync");
-		}
-	}
-#endif
 }
 
 /*
diff --git a/cpu/mpc85xx/tlb.c b/cpu/mpc85xx/tlb.c
index b319ad418b..b2c799ad12 100644
--- a/cpu/mpc85xx/tlb.c
+++ b/cpu/mpc85xx/tlb.c
@@ -79,7 +79,6 @@ void invalidate_tlb(u8 tlb)
 
 void init_tlbs(void)
 {
-#ifdef CONFIG_FSL_INIT_TLBS
 	int i;
 
 	for (i = 0; i < num_tlb_entries; i++) {
@@ -88,7 +87,6 @@ void init_tlbs(void)
 			tlb_table[i].ts, tlb_table[i].esel, tlb_table[i].tsize,
 			tlb_table[i].iprot);
 	}
-#endif
 
 	return ;
 }