arm:at91-boards: remove console_init_f where unnecessary

[karo-tx-uboot.git] / board / fads / fads.c

diff --git a/board/fads/fads.c b/board/fads/fads.c
index 278fa2ab2e2b331062cdacf5ab2db40f9fd2f56a..317d279603a017b2c54a8723a7170e35afa18d36 100644 (file)
--- a/board/fads/fads.c
+++ b/board/fads/fads.c
@@ -449,19 +449,19 @@ static int _initsdram(uint base, uint noMbytes)
        /* Now run the precharge/nop/mrs commands.
        */
 
-       memctl->memc_mcr = 0x80808111;   /* run umpb cs4 1 count 1, addr 0x11 ??? (50Mhz) */
-                                        /* run umpb cs4 1 count 1, addr 0x11 precharge+MRS (100Mhz) */
+       memctl->memc_mcr = 0x80808111;   /* run umpb cs4 1 count 1, addr 0x11 ??? (50MHz) */
+                                        /* run umpb cs4 1 count 1, addr 0x11 precharge+MRS (100MHz) */
        udelay(200);
 
        /* Run 8 refresh cycles */
 
-       memctl->memc_mcr = SDRAM_MCRVALUE0; /* run upmb cs4 loop 1 addr 0x5 precharge+MRS (50 Mhz)*/
+       memctl->memc_mcr = SDRAM_MCRVALUE0; /* run upmb cs4 loop 1 addr 0x5 precharge+MRS (50 MHz)*/
                                            /* run upmb cs4 loop 1 addr 0x11 precharge+MRS (100MHz) */
 
        udelay(200);
 
-       memctl->memc_mbmr = SDRAM_MBMRVALUE1; /* TLF 4 (100 Mhz) or TLF 8 (50MHz) */
-       memctl->memc_mcr = SDRAM_MCRVALUE1; /* run upmb cs4 loop 1 addr 0x30 refr (50 Mhz) */
+       memctl->memc_mbmr = SDRAM_MBMRVALUE1; /* TLF 4 (100 MHz) or TLF 8 (50MHz) */
+       memctl->memc_mcr = SDRAM_MCRVALUE1; /* run upmb cs4 loop 1 addr 0x30 refr (50 MHz) */
                                            /* run upmb cs4 loop 1 addr 0x11 precharge+MRS ??? (100MHz) */
 
        udelay(200);
@@ -603,15 +603,17 @@ static int initsdram(uint base, uint *noMbytes)
 phys_size_t initdram (int board_type)
 {
        uint sdramsz = 0;       /* size of sdram in Mbytes */
-       uint base = 0;          /* base of dram in bytes */
        uint m = 0;             /* size of dram in Mbytes */
 #ifndef CONFIG_MPC885ADS
+       uint base = 0;          /* base of dram in bytes */
        uint k, s;
 #endif
 
 #ifdef CONFIG_FADS
        if (!initsdram (0x00000000, &sdramsz)) {
+#ifndef CONFIG_MPC885ADS
                base = sdramsz << 20;
+#endif
                printf ("(%u MB SDRAM) ", sdramsz);
        }
 #endif