Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / freescale / m5329evb / m5329evb.c

diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c
index 07a02c27298abe77577703a74d43339be9617ef6..1f77adf4c22a3001004edf70bbb3fa32b2cd6f6f 100644 (file)
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/freescale/m5329evb/m5329evb.c
@@ -2,31 +2,16 @@
  * (C) Copyright 2000-2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
+ * Copyright (C) 2004-2007, 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 <config.h>
 #include <common.h>
 #include <asm/immap.h>
+#include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -37,12 +22,12 @@ int checkboard(void)
        return 0;
 };
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
-       volatile sdram_t *sdram = (volatile sdram_t *)(MMAP_SDRAM);
+       sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
        u32 dramsize, i;
 
-       dramsize = CFG_SDRAM_SIZE * 0x100000;
+       dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
 
        for (i = 0x13; i < 0x20; i++) {
                if (dramsize == (1 << i))
@@ -50,29 +35,30 @@ long int initdram(int board_type)
        }
        i--;
 
-       sdram->cs0 = (CFG_SDRAM_BASE | i);
-       sdram->cfg1 = CFG_SDRAM_CFG1;
-       sdram->cfg2 = CFG_SDRAM_CFG2;
+       out_be32(&sdram->cs0, CONFIG_SYS_SDRAM_BASE | i);
+       out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
+       out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
 
        /* Issue PALL */
-       sdram->ctrl = CFG_SDRAM_CTRL | 2;
+       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
 
        /* Issue LEMR */
-       sdram->mode = CFG_SDRAM_EMOD;
-       sdram->mode = (CFG_SDRAM_MODE | 0x04000000);
+       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
+       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE | 0x04000000);
 
        udelay(500);
 
        /* Issue PALL */
-       sdram->ctrl = (CFG_SDRAM_CTRL | 2);
+       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
 
        /* Perform two refresh cycles */
-       sdram->ctrl = CFG_SDRAM_CTRL | 4;
-       sdram->ctrl = CFG_SDRAM_CTRL | 4;
+       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
+       out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
 
-       sdram->mode = CFG_SDRAM_MODE;
+       out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
 
-       sdram->ctrl = (CFG_SDRAM_CTRL & ~0x80000000) | 0x10000c00;
+       out_be32(&sdram->ctrl,
+               (CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
 
        udelay(100);
 
@@ -86,12 +72,3 @@ int testdram(void)
 
        return (0);
 }
-
-#ifdef CFG_FLASH_CFI
-void sync(void)
-{
-       /* This sync function is PowerPC intruction,
-          coldfire does not have this instruction. Dummy function */
-}
-#endif                         /* CFG_FLASH_CFI */
-