X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Fsh%2Flib%2Fboard.c;h=d9c0c228e06c5b44c7eba2253414a8357d87381f;hb=d194837fc3042d943ba088fcc221d534330b2872;hp=cdac3826c76e20698e49c1dcd041fb0599236b0e;hpb=c6b734f5aea2ba75caaa1929f7e649ecda8d2f31;p=oweals%2Fu-boot.git

diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index cdac3826c7..d9c0c228e0 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -22,7 +22,6 @@
 #include <command.h>
 #include <malloc.h>
 #include <stdio_dev.h>
-#include <timestamp.h>
 #include <version.h>
 #include <watchdog.h>
 #include <net.h>
@@ -39,21 +38,21 @@ 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)
 {
 	gd->bd->bi_flashsize = flash_init();
 
 	if (gd->bd->bi_flashsize >= (1024 * 1024))
-		printf("FLASH: %ldMB\n", 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);
+		printf("Flash: %ldKB\n", gd->bd->bi_flashsize / 1024);
 
 	return 0;
 }
+#endif /* CONFIG_SYS_NO_FLASH */
 
 #if defined(CONFIG_CMD_NAND)
 # include <nand.h>
@@ -108,6 +107,15 @@ static int sh_net_init(void)
 }
 #endif
 
+#if defined(CONFIG_CMD_MMC)
+static int sh_mmc_init(void)
+{
+	puts("MMC:   ");
+	mmc_initialize(gd->bd);
+	return 0;
+}
+#endif
+
 typedef int (init_fnc_t) (void);
 
 init_fnc_t *init_sequence[] =
@@ -125,17 +133,22 @@ 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 */
+#endif
+#if defined(CONFIG_CMD_MMC)
+	sh_mmc_init,
 #endif
 	NULL			/* Terminate this list */
 };
@@ -157,7 +170,9 @@ 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;