diff options
| author | Mingkai Hu <Mingkai.hu@freescale.com> | 2009-06-26 14:51:30 +0800 |
|---|---|---|
| committer | Scott Sweeny <scott.sweeny@timesys.com> | 2010-09-29 17:32:29 -0400 |
| commit | ef4d042ed65388dd0abad4de86d452cc190f3b76 (patch) | |
| tree | f3617374846b3c2683ef3d8feb6785a09d6cdfdc | |
| parent | ba504cfb0af37adbbaf86e3db7d19b66e0eb1def (diff) | |
Make mmc init come before env_relocate
If the environment variables are saved on the MMC/SD card,
env_relocat can't relocate env from MMC/SD card without mmc init.
Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
| -rw-r--r-- | lib_ppc/board.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c index dd22f99c67..63f38410b6 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -784,6 +784,12 @@ void board_init_r (gd_t *id, ulong dest_addr) nand_init(); /* go init the NAND */ #endif +#ifdef CONFIG_GENERIC_MMC + WATCHDOG_RESET (); + puts ("MMC: "); + mmc_initialize (bd); +#endif + /* relocate environment function pointers etc. */ env_relocate (); @@ -940,12 +946,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: "); |