tizen 2.3.1 release

[platform/kernel/u-boot.git] / board / atmel / at91rm9200ek / at91rm9200ek.c

diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c
index 64ab572..d242583 100644 (file)
--- a/board/atmel/at91rm9200ek/at91rm9200ek.c
+++ b/board/atmel/at91rm9200ek/at91rm9200ek.c
@@ -7,7 +7,23 @@
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Marius Groeger <mgroeger@sysgo.de>
  *
- * SPDX-License-Identifier:    GPL-2.0+
+ * 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
  */
 
 #include <common.h>
@@ -15,7 +31,6 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_common.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -29,7 +44,7 @@ int board_init(void)
         * Correct IRDA resistor problem
         * Set PA23_TXD in Output
         */
-       writel(ATMEL_PMX_AA_TXD2, &pio->pioa.oer);
+       writel(AT91_PMX_AA_TXD2, &pio->pioa.oer);
 
        /* arch number of AT91RM9200EK-Board */
        gd->bd->bi_arch_number = MACH_TYPE_AT91RM9200EK;
@@ -39,16 +54,10 @@ int board_init(void)
        return 0;
 }
 
-int board_early_init_f(void)
-{
-       at91_seriald_hw_init();
-       return 0;
-}
-
 int dram_init (void)
 {
        /* dram_init must store complete ramsize in gd->ram_size */
-       gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+       gd->ram_size = get_ram_size((volatile long *)CONFIG_SYS_SDRAM_BASE,
                        CONFIG_SYS_SDRAM_SIZE);
        return 0;
 }
@@ -56,6 +65,6 @@ int dram_init (void)
 #ifdef CONFIG_DRIVER_AT91EMAC
 int board_eth_init(bd_t *bis)
 {
-       return at91emac_register(bis, (u32) ATMEL_BASE_EMAC);
+       return at91emac_register(bis, (u32) AT91_EMAC_BASE);
 }
 #endif