board_f: Drop return value from initdram()

[people/ms/u-boot.git] / board / freescale / m54451evb / m54451evb.c

diff --git a/board/freescale/m54451evb/m54451evb.c b/board/freescale/m54451evb/m54451evb.c
index 768f40bb0aa83efe9ba1637738c51a0a57cbe95d..653a11352cca5d554957e03eada05a0b85d90283 100644 (file)
--- a/board/freescale/m54451evb/m54451evb.c
+++ b/board/freescale/m54451evb/m54451evb.c
@@ -2,31 +2,16 @@
  * (C) Copyright 2000-2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
+ * Copyright (C) 2004-2008, 2012 Freescale Semiconductor, Inc.
  * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <spi.h>
 #include <asm/immap.h>
+#include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -41,7 +26,7 @@ int checkboard(void)
        return 0;
 };
 
-phys_size_t initdram(int board_type)
+int initdram(void)
 {
        u32 dramsize;
 #ifdef CONFIG_CF_SBF
@@ -49,16 +34,16 @@ phys_size_t initdram(int board_type)
         * Serial Boot: The dram is already initialized in start.S
         * only require to return DRAM size
         */
-       dramsize = CFG_SDRAM_SIZE * 0x100000;
+       dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
 #else
-       volatile sdramc_t *sdram = (volatile sdramc_t *)(MMAP_SDRAM);
-       volatile gpio_t *gpio = (volatile gpio_t *)(MMAP_GPIO);
+       sdramc_t *sdram = (sdramc_t *)(MMAP_SDRAM);
+       gpio_t *gpio = (gpio_t *)(MMAP_GPIO);
        u32 i;
 
-       dramsize = CFG_SDRAM_SIZE * 0x100000;
+       dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
 
-       if ((sdram->sdcfg1 == CFG_SDRAM_CFG1) &&
-           (sdram->sdcfg2 == CFG_SDRAM_CFG2))
+       if ((in_be32(&sdram->sdcfg1) == CONFIG_SYS_SDRAM_CFG1) &&
+           (in_be32(&sdram->sdcfg2) == CONFIG_SYS_SDRAM_CFG2))
                return dramsize;
 
        for (i = 0x13; i < 0x20; i++) {
@@ -67,36 +52,39 @@ phys_size_t initdram(int board_type)
        }
        i--;
 
-       gpio->mscr_sdram = CFG_SDRAM_DRV_STRENGTH;
+       out_8(&gpio->mscr_sdram, CONFIG_SYS_SDRAM_DRV_STRENGTH);
 
-       sdram->sdcs0 = (CFG_SDRAM_BASE | i);
+       out_be32(&sdram->sdcs0, CONFIG_SYS_SDRAM_BASE | i);
 
-       sdram->sdcfg1 = CFG_SDRAM_CFG1;
-       sdram->sdcfg2 = CFG_SDRAM_CFG2;
+       out_be32(&sdram->sdcfg1, CONFIG_SYS_SDRAM_CFG1);
+       out_be32(&sdram->sdcfg2, CONFIG_SYS_SDRAM_CFG2);
 
        udelay(200);
 
        /* Issue PALL */
-       sdram->sdcr = CFG_SDRAM_CTRL | 2;
+       out_be32(&sdram->sdcr, CONFIG_SYS_SDRAM_CTRL | 2);
        __asm__("nop");
 
        /* Perform two refresh cycles */
-       sdram->sdcr = CFG_SDRAM_CTRL | 4;
+       out_be32(&sdram->sdcr, CONFIG_SYS_SDRAM_CTRL | 4);
        __asm__("nop");
-       sdram->sdcr = CFG_SDRAM_CTRL | 4;
+       out_be32(&sdram->sdcr, CONFIG_SYS_SDRAM_CTRL | 4);
        __asm__("nop");
 
        /* Issue LEMR */
-       sdram->sdmr = CFG_SDRAM_MODE;
+       out_be32(&sdram->sdmr, CONFIG_SYS_SDRAM_MODE);
        __asm__("nop");
-       sdram->sdmr = CFG_SDRAM_EMOD;
+       out_be32(&sdram->sdmr, CONFIG_SYS_SDRAM_MODE);
        __asm__("nop");
 
-       sdram->sdcr = (CFG_SDRAM_CTRL & ~0x80000000) | 0x10000000;
+       out_be32(&sdram->sdcr,
+               (CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000000);
 
        udelay(100);
 #endif
-       return (dramsize);
+       gd->ram_size = dramsize;
+
+       return 0;
 };
 
 int testdram(void)