summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-01-17 02:19:18 -0600
committerKumar Gala <galak@kernel.crashing.org>2008-01-17 02:19:18 -0600
commit7dc358bb0de9e2fa341f3b4c914466b1f34b2d89 (patch)
treef88691a059949e15024eb8f6f5b086559a4a09d3 /cpu
parent3b558e26a5ef31635787d6d6e97d70939d4f892d (diff)
downloadu-boot-imx-7dc358bb0de9e2fa341f3b4c914466b1f34b2d89.zip
u-boot-imx-7dc358bb0de9e2fa341f3b4c914466b1f34b2d89.tar.gz
u-boot-imx-7dc358bb0de9e2fa341f3b4c914466b1f34b2d89.tar.bz2
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>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc85xx/cpu_init.c20
-rw-r--r--cpu/mpc85xx/tlb.c2
2 files changed, 0 insertions, 22 deletions
diff --git a/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c
index 4e2bfe7..c0ff1d5 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 b319ad4..b2c799a 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 ;
}