Merge branch 'master' of git://git.denx.de/u-boot-nds32

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

diff --git a/board/freescale/m5253evbe/m5253evbe.c b/board/freescale/m5253evbe/m5253evbe.c
index 658748b0dcf589317840138b7ac1b6665c19e2ab..2c6afadb9ac460431475c264cf1be51baf58b88c 100644 (file)
--- a/board/freescale/m5253evbe/m5253evbe.c
+++ b/board/freescale/m5253evbe/m5253evbe.c
@@ -5,29 +5,15 @@
  * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc.
  * Hayden Fraser (Hayden.Fraser@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 <asm/immap.h>
 #include <asm/io.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int checkboard(void)
 {
        puts("Board: ");
@@ -35,7 +21,7 @@ int checkboard(void)
        return 0;
 };
 
-phys_size_t initdram(int board_type)
+int dram_init(void)
 {
        /*
         * Check to see if the SDRAM has already been initialized
@@ -82,7 +68,9 @@ phys_size_t initdram(int board_type)
                *(u32 *) (CONFIG_SYS_SDRAM_BASE + 0x800) = 0xa5a5a5a5;
        }
 
-       return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+       gd->ram_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+
+       return 0;
 }
 
 int testdram(void)
@@ -93,7 +81,7 @@ int testdram(void)
        return (0);
 }
 
-#ifdef CONFIG_CMD_IDE
+#ifdef CONFIG_IDE
 #include <ata.h>
 int ide_preinit(void)
 {
@@ -138,4 +126,4 @@ void ide_set_reset(int idereset)
                setbits_8(&ata->cr, 0x01);
        }
 }
-#endif                         /* CONFIG_CMD_IDE */
+#endif                         /* CONFIG_IDE */