projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
[oweals/u-boot.git]
/
arch
/
sh
/
lib
/
board.c
diff --git
a/arch/sh/lib/board.c
b/arch/sh/lib/board.c
index ed91643427015176a947909b530611b92e09aaa0..d9c0c228e06c5b44c7eba2253414a8357d87381f 100644
(file)
--- 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 <command.h>
#include <malloc.h>
#include <stdio_dev.h>
-#include <timestamp.h>
#include <version.h>
#include <watchdog.h>
#include <net.h>
#include <version.h>
#include <watchdog.h>
#include <net.h>
@@
-39,8
+38,6
@@
extern int board_init(void);
extern int dram_init(void);
extern int timer_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
unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN;
#ifndef CONFIG_SYS_NO_FLASH
@@
-110,6
+107,15
@@
static int sh_net_init(void)
}
#endif
}
#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[] =
typedef int (init_fnc_t) (void);
init_fnc_t *init_sequence[] =
@@
-135,11
+141,14
@@
init_fnc_t *init_sequence[] =
stdio_init,
console_init_r,
interrupt_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 */
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 */
};
#endif
NULL /* Terminate this list */
};