powerpc: remove MBX and MBX860T boards support

[u-boot] / arch / powerpc / cpu / mpc8xx / cpu_init.c

diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index 53f873d1abf6052c0ef9674b2f62f979af930eaa..69455c7be02a84891eac498adc9f4c6e09518dac 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
@@ -29,12 +29,10 @@ void cpm_load_patch (volatile immap_t * immr);
  */
 void cpu_init_f (volatile immap_t * immr)
 {
-#ifndef CONFIG_MBX
        volatile memctl8xx_t *memctl = &immr->im_memctl;
 # ifdef CONFIG_SYS_PLPRCR
        ulong mfmask;
 # endif
-#endif
        ulong reg;
 
        /* SYPCR - contains watchdog control (11-9) */
@@ -74,8 +72,6 @@ void cpu_init_f (volatile immap_t * immr)
 
        immr->im_clkrstk.cark_plprcrk = KAPWR_KEY;
 
-#ifndef CONFIG_MBX             /* MBX board does things different */
-
        /* If CONFIG_SYS_PLPRCR (set in the various *_config.h files) tries to
         * set the MF field, then just copy CONFIG_SYS_PLPRCR over car_plprcr,
         * otherwise OR in CONFIG_SYS_PLPRCR so we do not change the current MF
@@ -203,8 +199,6 @@ void cpu_init_f (volatile immap_t * immr)
        memctl->memc_br7 = CONFIG_SYS_BR7_PRELIM;
 #endif
 
-#endif /* ! CONFIG_MBX */
-
        /*
         * Reset CPM
         */
@@ -213,16 +207,6 @@ void cpu_init_f (volatile immap_t * immr)
                __asm__ ("eieio");
        } while (immr->im_cpm.cp_cpcr & CPM_CR_FLG);
 
-#ifdef CONFIG_MBX
-       /*
-        * on the MBX, things are a little bit different:
-        * - we need to read the VPD to get board information
-        * - the plprcr is set up dynamically
-        * - the memory controller is set up dynamically
-        */
-       mbx_init ();
-#endif /* CONFIG_MBX */
-
 #ifdef CONFIG_RPXCLASSIC
        rpxclassic_init ();
 #endif