SPC1920: cleanup memory contoller setup

[platform/kernel/u-boot.git] / board / spc1920 / spc1920.c

diff --git a/board/spc1920/spc1920.c b/board/spc1920/spc1920.c
index d0a6ff1..1f5dcb5 100644 (file)
--- a/board/spc1920/spc1920.c
+++ b/board/spc1920/spc1920.c
@@ -175,9 +175,9 @@ long int initdram (int board_type)
        /* initalize the DSP Host Port Interface */
        hpi_init();
 
-       /* PLD Setup */
-       memctl->memc_or5 = CFG_OR5_PRELIM;
-       memctl->memc_br5 = CFG_BR5_PRELIM;
+       /* FRAM Setup */
+       memctl->memc_or4 = CFG_OR4;
+       memctl->memc_br4 = CFG_BR4;
        udelay(1000);
 
        return (size_b0);
@@ -220,10 +220,20 @@ int board_early_init_f(void)
        immap->im_ioport.iop_pdpar &= ~(0x0040);
        immap->im_ioport.iop_pddir |= 0x0040;
        immap->im_ioport.iop_pddat |= 0x0040;
-
 #endif
 
-       /* Enable PD10 (COM2_EN) */
+       /*
+        * Enable console on SMC1. This requires turning on
+        * the com2_en signal and SMC1_DISABLE
+        */
+
+       /* SMC1_DISABLE: PB17 */
+       immap->im_cpm.cp_pbodr &= ~0x4000;
+       immap->im_cpm.cp_pbpar &= ~0x4000;
+       immap->im_cpm.cp_pbdir |= 0x4000;
+       immap->im_cpm.cp_pbdat &= ~0x4000;
+
+       /* COM2_EN: PD10 */
        immap->im_ioport.iop_pdpar &= ~0x0020;
        immap->im_ioport.iop_pddir &= ~0x4000;
        immap->im_ioport.iop_pddir |= 0x0020;