odroid: remove CONFIG_DM_I2C_COMPAT config

[platform/kernel/u-boot.git] / 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 69455c7..f621d62 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
@@ -44,11 +44,7 @@ void cpu_init_f (volatile immap_t * immr)
 #endif /* CONFIG_WATCHDOG */
 
        /* SIUMCR - contains debug pin configuration (11-6) */
-#ifndef CONFIG_SVM_SC8xx
        immr->im_siu_conf.sc_siumcr |= CONFIG_SYS_SIUMCR;
-#else
-       immr->im_siu_conf.sc_siumcr = CONFIG_SYS_SIUMCR;
-#endif
        /* initialize timebase status and control register (11-26) */
        /* unlock TBSCRK */
 
@@ -129,23 +125,6 @@ void cpu_init_f (volatile immap_t * immr)
         *  I owe him a free beer. - wd]
         */
 
-#if defined(CONFIG_HERMES)     || \
-    defined(CONFIG_ICU862)     || \
-    defined(CONFIG_IP860)      || \
-    defined(CONFIG_IVML24)     || \
-    defined(CONFIG_IVMS8)      || \
-    defined(CONFIG_LWMON)      || \
-    defined(CONFIG_MHPC)       || \
-    defined(CONFIG_R360MPI)    || \
-    defined(CONFIG_RMU)                || \
-    defined(CONFIG_RPXCLASSIC) || \
-    defined(CONFIG_RPXLITE)    || \
-    defined(CONFIG_SPC1920)    || \
-    defined(CONFIG_SPD823TS)
-
-       memctl->memc_br0 = CONFIG_SYS_BR0_PRELIM;
-#endif
-
 #if defined(CONFIG_SYS_OR0_REMAP)
        memctl->memc_or0 = CONFIG_SYS_OR0_REMAP;
 #endif
@@ -165,10 +144,6 @@ void cpu_init_f (volatile immap_t * immr)
        memctl->memc_br1 = CONFIG_SYS_BR1_PRELIM;
 #endif
 
-#if defined(CONFIG_IP860) /* disable CS0 now that Flash is mapped on CS1 */
-       memctl->memc_br0 = 0;
-#endif
-
 #if defined(CONFIG_SYS_OR2_PRELIM) && defined(CONFIG_SYS_BR2_PRELIM)
        memctl->memc_or2 = CONFIG_SYS_OR2_PRELIM;
        memctl->memc_br2 = CONFIG_SYS_BR2_PRELIM;
@@ -207,14 +182,6 @@ void cpu_init_f (volatile immap_t * immr)
                __asm__ ("eieio");
        } while (immr->im_cpm.cp_cpcr & CPM_CR_FLG);
 
-#ifdef CONFIG_RPXCLASSIC
-       rpxclassic_init ();
-#endif
-
-#if defined(CONFIG_RPXLITE) && defined(CONFIG_ENV_IS_IN_NVRAM)
-       rpxlite_init ();
-#endif
-
 #ifdef CONFIG_SYS_RCCR                 /* must be done before cpm_load_patch() */
        /* write config value */
        immr->im_cpm.cp_rccr = CONFIG_SYS_RCCR;