board_f: Drop return value from initdram()

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

diff --git a/board/freescale/m5272c3/m5272c3.c b/board/freescale/m5272c3/m5272c3.c
index 902ca3aac672fbf45cb21a31b168c9c7fb98a087..bbe06ba9dfc59d1153da109efdbf3a86cc93280a 100644 (file)
--- a/board/freescale/m5272c3/m5272c3.c
+++ b/board/freescale/m5272c3/m5272c3.c
@@ -2,28 +2,16 @@
  * (C) Copyright 2000-2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
+ * Copyright (C) 2012 Freescale Semiconductor, Inc. All Rights Reserved.
  *
- * 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 <asm/immap.h>
+#include <asm/io.h>
 
+DECLARE_GLOBAL_DATA_PTR;
 
 int checkboard (void) {
        puts ("Board: ");
@@ -31,16 +19,19 @@ int checkboard (void) {
        return 0;
        };
 
-phys_size_t initdram (int board_type) {
-       volatile sdramctrl_t * sdp = (sdramctrl_t *)(MMAP_SDRAM);
+int initdram(void)
+{
+       sdramctrl_t * sdp = (sdramctrl_t *)(MMAP_SDRAM);
 
-       sdp->sdram_sdtr = 0xf539;
-       sdp->sdram_sdcr = 0x4211;
+       out_be16(&sdp->sdram_sdtr, 0xf539);
+       out_be16(&sdp->sdram_sdcr, 0x4211);
 
        /* Dummy write to start SDRAM */
        *((volatile unsigned long *)0) = 0;
 
-       return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+       gd->ram_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+
+       return 0;
        };
 
 int testdram (void) {