bd_info: remove bi_barudrate member from struct bd_info

[karo-tx-uboot.git] / arch / sh / lib / board.c

diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index fe53ab4de9194351a9906a91cb44780220847914..1eb7afb89e5ab7d57b14380781ecb4ad63357a90 100644 (file)
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -1,55 +1,46 @@
 /*
- * Copyright (C) 2007,2008
+ * Copyright (C) 2007, 2008, 2010
  * Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
  *
- * 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 <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
 #include <miiphy.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 extern int cpu_init(void);
 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
 static int sh_flash_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_flashsize = flash_init();
-       printf("FLASH: %ldMB\n", gd->bd->bi_flashsize / (1024*1024));
+
+       if (gd->bd->bi_flashsize >= (1024 * 1024))
+               printf("Flash: %ldMB\n", gd->bd->bi_flashsize / (1024*1024));
+       else
+               printf("Flash: %ldKB\n", gd->bd->bi_flashsize / 1024);
 
        return 0;
 }
+#endif /* CONFIG_SYS_NO_FLASH */
 
 #if defined(CONFIG_CMD_NAND)
 # include <nand.h>
@@ -61,6 +52,7 @@ 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
@@ -96,11 +88,11 @@ static int sh_mem_env_init(void)
        return 0;
 }
 
-#if defined(CONFIG_CMD_NET)
-static int sh_net_init(void)
+#if defined(CONFIG_CMD_MMC)
+static int sh_mmc_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-       gd->bd->bi_ip_addr = getenv_IPaddr("ipaddr");
+       puts("MMC:   ");
+       mmc_initialize(gd->bd);
        return 0;
 }
 #endif
@@ -122,25 +114,25 @@ init_fnc_t *init_sequence[] =
        dram_init,              /* SDRAM init */
        timer_init,             /* SuperH Timer (TCNT0 only) init */
        sh_mem_env_init,
-       sh_flash_init,  /* Flash memory(NOR) init*/
+#ifndef CONFIG_SYS_NO_FLASH
+       sh_flash_init,  /* Flash memory init*/
+#endif
        INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */
        INIT_FUNC_PCI_INIT      /* PCI init */
        stdio_init,
        console_init_r,
        interrupt_init,
-#ifdef BOARD_LATE_INIT
+#ifdef CONFIG_BOARD_LATE_INIT
        board_late_init,
 #endif
-#if defined(CONFIG_CMD_NET)
-       sh_net_init,            /* SH specific eth init */
+#if defined(CONFIG_CMD_MMC)
+       sh_mmc_init,
 #endif
        NULL                    /* Terminate this list */
 };
 
 void sh_generic_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        bd_t *bd;
        init_fnc_t **init_fnc_ptr;
 
@@ -156,12 +148,13 @@ void sh_generic_init(void)
        bd = gd->bd;
        bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
        bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
+#ifndef CONFIG_SYS_NO_FLASH
        bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
+#endif
 #if defined(CONFIG_SYS_SRAM_BASE) && defined(CONFIG_SYS_SRAM_SIZE)
        bd->bi_sramstart = CONFIG_SYS_SRAM_BASE;
        bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;
 #endif
-       bd->bi_baudrate = CONFIG_BAUDRATE;
 
        for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
                WATCHDOG_RESET();
@@ -184,15 +177,8 @@ void sh_generic_init(void)
        bb_miiphy_init();
 #endif
 #if defined(CONFIG_CMD_NET)
-       {
-               char *s;
-               puts("Net:   ");
-               eth_initialize(gd->bd);
-
-               s = getenv("bootfile");
-               if (s != NULL)
-                       copy_filename(BootFile, s, sizeof(BootFile));
-       }
+       puts("Net:   ");
+       eth_initialize(gd->bd);
 #endif /* CONFIG_CMD_NET */
 
        while (1) {
@@ -200,12 +186,3 @@ void sh_generic_init(void)
                main_loop();
        }
 }
-
-/***********************************************************************/
-
-void hang(void)
-{
-       puts("Board ERROR\n");
-       for (;;)
-               ;
-}