diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-21 09:34:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-21 09:34:16 +0200 |
| commit | 0cc89de8ef60214083739904b011f6c255922723 (patch) | |
| tree | 17adeeae646a93fb7ee1e331915123cd8814a6df /arch/powerpc/lib | |
| parent | 6561863678822847be92c3bd06ae1d64acca4f6a (diff) | |
| parent | 07517e7f4f582d1607adbc444bab75af3ac4a7f9 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'arch/powerpc/lib')
| -rw-r--r-- | arch/powerpc/lib/board.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 0e00d8619e..628d067abf 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -783,6 +783,17 @@ void board_init_r (gd_t *id, ulong dest_addr) nand_init(); /* go init the NAND */ #endif +#ifdef CONFIG_GENERIC_MMC +/* + * MMC initialization is called before relocating env. + * Thus It is required that operations like pin multiplexer + * be put in board_init. + */ + WATCHDOG_RESET (); + puts ("MMC: "); + mmc_initialize (bd); +#endif + /* relocate environment function pointers etc. */ env_relocate (); @@ -939,12 +950,6 @@ void board_init_r (gd_t *id, ulong dest_addr) scsi_init (); #endif -#ifdef CONFIG_GENERIC_MMC - WATCHDOG_RESET (); - puts ("MMC: "); - mmc_initialize (bd); -#endif - #if defined(CONFIG_CMD_DOC) WATCHDOG_RESET (); puts ("DOC: "); |