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>

diff --git a/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c
index 4e2bfe73e95a6b09d25377f4c36a3cfc3e15b373..c0ff1d5120d5237efdde7689934d6ce30f6586a2 100644 (file)
--- 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 b319ad418b6d7b43c56b2418e287c1eb245cd6f8..b2c799ad126ef4213f406efd75b59fdde87c6b7f 100644 (file)
--- 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 ;
 }

diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h
index c2dde41b84c3ec1e8b20bf82c4d44e23739ed268..c14376e7f4923b8429f56fed7a951bb5c22e9eb7 100644 (file)
--- a/include/configs/ATUM8548.h
+++ b/include/configs/ATUM8548.h
@@ -64,7 +64,6 @@
 #define CONFIG_INTERRUPTS              /* enable pci, srio, ddr interrupts */
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 #define MPC85xx_DDR_SDRAM_CLK_CNTL     /* 85xx has clock control reg */
 

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 74076fbe4a0700fc190d7ca0760420de957353b6..5ea7b250471be1364febc4e45941181bc0443904 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -56,7 +56,6 @@
 #define CONFIG_MEM_INIT_VALUE          0xDeadBeef
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /*
  * sysclk for MPC85xx

diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h
index 416cee4b2fc69b08d93897fc49494b82718f8381..bf64f27049c9bd785d1a7ef161608dc2a6abbe96 100644 (file)
--- a/include/configs/MPC8540EVAL.h
+++ b/include/configs/MPC8540EVAL.h
@@ -44,7 +44,6 @@
 #define CONFIG_DDR_DLL                      /* possible DLL fix needed */
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /* Using Localbus SDRAM to emulate flash before we can program the flash,
  * normally you only need a flash-boot image(u-boot.bin),if unsure undef this.

diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 92195ed22537ec11bcaa466d7c39cebbd40dfbec..7334088b18fedf696512e57ec62fcee00a691b01 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -48,7 +48,6 @@
 #define CONFIG_MEM_INIT_VALUE          0xDeadBeef
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /*
  * When initializing flash, if we cannot find the manufacturer ID,

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 1269c8ae3a2c41f3fe1125e8c2ae2d194adaf51b..a8942095c952fd73d6d8b336a8203c3fff58a54c 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -43,7 +43,6 @@
 #define CONFIG_FSL_PCIE_RESET  1       /* need PCIe reset errata */
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 77bcc29aa6f9e742940c956ed188adac4c467ed5..a3db9f445712f66b7bf73c07bdf96b8f9dc698b6 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -56,7 +56,6 @@
 #define CONFIG_INTERRUPTS              /* enable pci, srio, ddr interrupts */
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /*
  * When initializing flash, if we cannot find the manufacturer ID,

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index e7b969430bfdd1defa01102e21c11142577df61a..93877aedb048dc478f5cc871eb0983e977c4eb86 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -48,7 +48,6 @@
 #define CONFIG_MEM_INIT_VALUE          0xDeadBeef
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /*
  * When initializing flash, if we cannot find the manufacturer ID,

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 84c517f7ba798f02bc0a444c32349e8964275e7c..08884b36f07ba14cebc9f7411eaef79f5c96a8f9 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -53,7 +53,6 @@
 #define CONFIG_MEM_INIT_VALUE          0xDeadBeef
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /*
  * sysclk for MPC85xx

diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 04f442f9f92701fa34d28f411381398a2c6e9eae..a12d193c712e441da160459d5b4a939fb3988f62 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -50,7 +50,6 @@
 #define CONFIG_MEM_INIT_VALUE          0xDeadBeef
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /*
  * When initializing flash, if we cannot find the manufacturer ID,

diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index d881057a0b15109da7e200064a417cd0a789895a..819bee70a1a5a1dac236b7f782e5c9a44de17b19 100644 (file)
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -52,7 +52,6 @@
 #define CONFIG_MEM_INIT_VALUE          0xDEADBEEF
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /*
  * sysclk for MPC85xx

diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 48bbef6db761340b63e8fff9954441cf0a9b724e..8902f42ff15e482de80516c3bba723797c5beae9 100644 (file)
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -52,7 +52,6 @@
 #define CONFIG_MEM_INIT_VALUE          0xDEADBEEF
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /*
  * sysclk for MPC85xx

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 322b5fa2b360e67f87b69d5c3870837ba830866c..2bbfe9aa62b1f871438f7dbeeb26553ff3a88db9 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -57,7 +57,6 @@
 #undef  CONFIG_ETHER_ON_FCC            /* cpm FCC ethernet support     */
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 #define CONFIG_ENV_OVERWRITE
 

diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index e2e9964c3b9849cd560e5582cdac0e6867ed5688..dd0654b700cbcc28c22e576988abd6faf06ed899 100644 (file)
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -51,7 +51,6 @@
 #endif
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /*
  * sysclk for MPC85xx

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 9c80a79c8afe51a852f2b9c5fbf0a70491f334e2..0a7a90497501dcf33e8c7d46cda7d7af5378b8fa 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -57,7 +57,6 @@
 #define CONFIG_INTERRUPTS              /* enable pci, srio, ddr interrupts */
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 #define MPC85xx_DDR_SDRAM_CLK_CNTL     /* 85xx has clock control reg */
 

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 7761f516f3564f3e5be82562765a658b67c02f98..f9ede5f1879cc7b28aefcb6c0f2b8adc8eaa7fd0 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -51,7 +51,6 @@
 #undef  CONFIG_ETHER_ON_FCC            /* cpm FCC ethernet support     */
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 #define CONFIG_ENV_OVERWRITE
 

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index d6d4c464d52ce9a7efeb955d58c3dce8f8a4cab8..047e1cf99a304e3465cae13e1d462dee6c0deb52 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -52,7 +52,6 @@
 #define CONFIG_DDR_2T_TIMING           /* Sets the 2T timing bit */
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /* sysclk for MPC85xx
  */

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 21fb6f644cff969804ca6ea4f73f809aae643578..e09dd7163f79d34e2e89616a2ab509b8e2743514 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -52,7 +52,6 @@
 #define CONFIG_DDR_2T_TIMING           /* Sets the 2T timing bit */
 
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-#define CONFIG_FSL_INIT_TLBS   1       /* Use common FSL init code */
 
 /* sysclk for MPC85xx
  */