diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-17 20:25:05 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-17 20:25:05 +0200 | 
| commit | cacc342d5aa311673efdc05770cb53246dd41c9f (patch) | |
| tree | 628ad99e5ea23c3f6ae6f728167056001bd16847 /arch/arm/lib/board.c | |
| parent | 5641f34f8b83b3dcb64ba5f6c0f83d2204c41387 (diff) | |
| parent | 59e0d611ad0418245e9600b50bf1374a725c95b6 (diff) | |
| download | olio-uboot-2014.01-cacc342d5aa311673efdc05770cb53246dd41c9f.tar.xz olio-uboot-2014.01-cacc342d5aa311673efdc05770cb53246dd41c9f.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/lib/board.c')
| -rw-r--r-- | arch/arm/lib/board.c | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 22bd2c9b0..108e6c40c 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -770,6 +770,11 @@ void board_init_r (gd_t *id, ulong dest_addr)  	onenand_init();  #endif +#ifdef CONFIG_GENERIC_MMC +       puts("MMC:   "); +       mmc_initialize(bd); +#endif +  #ifdef CONFIG_HAS_DATAFLASH  	AT91F_DataflashInit();  	dataflash_print_info(); @@ -835,11 +840,6 @@ void board_init_r (gd_t *id, ulong dest_addr)  	board_late_init ();  #endif -#ifdef CONFIG_GENERIC_MMC -	puts ("MMC:   "); -	mmc_initialize (gd->bd); -#endif -  #ifdef CONFIG_BITBANGMII  	bb_miiphy_init();  #endif |