tizen 2.3.1 release

[platform/kernel/u-boot.git] / board / trizepsiv / conxs.c

diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c
index 1ddf05d..99f665b 100644 (file)
--- a/board/trizepsiv/conxs.c
+++ b/board/trizepsiv/conxs.c
@@ -12,16 +12,29 @@
  * 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>
 #include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa.h>
-#include <asm/arch/regs-mmc.h>
 #include <netdev.h>
 #include <asm/io.h>
-#include <usb.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -43,7 +56,7 @@ extern struct serial_device serial_stuart_device;
  * Miscelaneous platform dependent initialisations
  */
 
-int board_usb_init(int index, enum usb_init_type init)
+int usb_board_init(void)
 {
        writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) &
                ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
@@ -70,9 +83,9 @@ int board_usb_init(int index, enum usb_init_type init)
        return 0;
 }
 
-int board_usb_cleanup(int index, enum usb_init_type init)
+void usb_board_init_fail(void)
 {
-       return 0;
+       return;
 }
 
 void usb_board_stop(void)
@@ -106,6 +119,7 @@ int board_init (void)
 
 int board_late_init(void)
 {
+#if defined(CONFIG_SERIAL_MULTI)
        char *console=getenv("boot_console");
 
        if ((console == NULL) || (strcmp(console,"serial_btuart") &&
@@ -116,12 +130,19 @@ int board_late_init(void)
        setenv("stdout",console);
        setenv("stdin", console);
        setenv("stderr",console);
+#endif
        return 0;
 }
 
+struct serial_device *default_serial_console (void)
+{
+       return &serial_ffuart_device;
+}
+
+extern void pxa_dram_init(void);
 int dram_init(void)
 {
-       pxa2xx_dram_init();
+       pxa_dram_init();
        gd->ram_size = PHYS_SDRAM_1_SIZE;
        return 0;
 }
@@ -138,11 +159,3 @@ int board_eth_init(bd_t *bis)
        return dm9000_initialize(bis);
 }
 #endif
-
-#ifdef CONFIG_CMD_MMC
-int board_mmc_init(bd_t *bis)
-{
-       pxa_mmc_register(0);
-       return 0;
-}
-#endif