Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'

[platform/kernel/u-boot.git] / post / cpu / mpc8xx / uart.c

diff --git a/post/cpu/mpc8xx/uart.c b/post/cpu/mpc8xx/uart.c
index 106a9b8..e54a4ca 100644 (file)
--- a/post/cpu/mpc8xx/uart.c
+++ b/post/cpu/mpc8xx/uart.c
@@ -100,17 +100,6 @@ static void smc_init (int smc_index)
        im->im_sdma.sdma_sdmr = 0x00;
 #endif
 
-#if defined(CONFIG_FADS)
-       /* Enable RS232 */
-       *((uint *) BCSR1) &=
-                       ~(smc_index == 1 ? BCSR1_RS232EN_1 : BCSR1_RS232EN_2);
-#endif
-
-#if defined(CONFIG_RPXLITE) || defined(CONFIG_RPXCLASSIC)
-       /* Enable Monitor Port Transceiver */
-       *((uchar *) BCSR0) |= BCSR0_ENMONXCVR;
-#endif
-
        /* Set the physical address of the host memory buffers in
         * the buffer descriptors.
         */
@@ -141,10 +130,6 @@ static void smc_init (int smc_index)
        up->smc_rfcr = SMC_EB;
        up->smc_tfcr = SMC_EB;
 
-#if defined(CONFIG_MBX)
-       board_serial_init ();
-#endif
-
        /* Set UART mode, 8 bit, no parity, one stop.
         * Enable receive and transmit.
         * Set local loopback mode.