tizen 2.3.1 release

[platform/kernel/u-boot.git] / arch / sh / lib / board.c

diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index 8498153..ed91643 100644 (file)
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -2,17 +2,30 @@
  * Copyright (C) 2007, 2008, 2010
  * Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
  *
- * SPDX-License-Identifier:    GPL-2.0+
+ * 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 <command.h>
 #include <malloc.h>
 #include <stdio_dev.h>
+#include <timestamp.h>
 #include <version.h>
 #include <watchdog.h>
 #include <net.h>
-#include <mmc.h>
 #include <environment.h>
 
 #ifdef CONFIG_BITBANGMII
@@ -26,6 +39,8 @@ extern int board_init(void);
 extern int dram_init(void);
 extern int timer_init(void);
 
+const char version_string[] = U_BOOT_VERSION" ("U_BOOT_DATE" - "U_BOOT_TIME")";
+
 unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN;
 
 #ifndef CONFIG_SYS_NO_FLASH
@@ -52,7 +67,6 @@ static int sh_flash_init(void)
 #if defined(CONFIG_WATCHDOG)
 extern int watchdog_init(void);
 extern int watchdog_disable(void);
-# undef INIT_FUNC_WATCHDOG_INIT
 # define INIT_FUNC_WATCHDOG_INIT       watchdog_init,
 # define WATCHDOG_DISABLE              watchdog_disable
 #else
@@ -88,11 +102,10 @@ static int sh_mem_env_init(void)
        return 0;
 }
 
-#if defined(CONFIG_CMD_MMC)
-static int sh_mmc_init(void)
+#if defined(CONFIG_CMD_NET)
+static int sh_net_init(void)
 {
-       puts("MMC:   ");
-       mmc_initialize(gd->bd);
+       gd->bd->bi_ip_addr = getenv_IPaddr("ipaddr");
        return 0;
 }
 #endif
@@ -122,11 +135,11 @@ init_fnc_t *init_sequence[] =
        stdio_init,
        console_init_r,
        interrupt_init,
-#ifdef CONFIG_BOARD_LATE_INIT
+#ifdef BOARD_LATE_INIT
        board_late_init,
 #endif
-#if defined(CONFIG_CMD_MMC)
-       sh_mmc_init,
+#if defined(CONFIG_CMD_NET)
+       sh_net_init,            /* SH specific eth init */
 #endif
        NULL                    /* Terminate this list */
 };
@@ -178,8 +191,15 @@ void sh_generic_init(void)
        bb_miiphy_init();
 #endif
 #if defined(CONFIG_CMD_NET)
-       puts("Net:   ");
-       eth_initialize(gd->bd);
+       {
+               char *s;
+               puts("Net:   ");
+               eth_initialize(gd->bd);
+
+               s = getenv("bootfile");
+               if (s != NULL)
+                       copy_filename(BootFile, s, sizeof(BootFile));
+       }
 #endif /* CONFIG_CMD_NET */
 
        while (1) {
@@ -187,3 +207,12 @@ void sh_generic_init(void)
                main_loop();
        }
 }
+
+/***********************************************************************/
+
+void hang(void)
+{
+       puts("Board ERROR\n");
+       for (;;)
+               ;
+}