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

[karo-tx-uboot.git] / board / balloon3 / balloon3.c

diff --git a/board/balloon3/balloon3.c b/board/balloon3/balloon3.c
index 26e34e99d7db071057705c82e9f001d1da3d8154..ecbac16d59008b8c4b4d8727681762de56b48d0a 100644 (file)
--- a/board/balloon3/balloon3.c
+++ b/board/balloon3/balloon3.c
@@ -3,24 +3,12 @@
  *
  * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
  *
- * 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/arch/hardware.h>
+#include <asm/arch/pxa.h>
 #include <serial.h>
 #include <asm/io.h>
 #include <spartan3.h>
@@ -52,15 +40,9 @@ int board_init(void)
        return 0;
 }
 
-struct serial_device *default_serial_console(void)
-{
-       return &serial_stuart_device;
-}
-
-extern void pxa_dram_init(void);
 int dram_init(void)
 {
-       pxa_dram_init();
+       pxa2xx_dram_init();
        gd->ram_size = PHYS_SDRAM_1_SIZE;
        return 0;
 }