env_mmc: Fix crashing bug encountered after enabling ARM relocation
authorSteve Sakoman <steve@sakoman.com>
Mon, 11 Oct 2010 12:51:39 +0000 (05:51 -0700)
committerWolfgang Denk <wd@denx.de>
Wed, 13 Oct 2010 19:52:13 +0000 (21:52 +0200)
The crash was occuring in env_relocate because it was being called prior
to mmc_initialize.  This patch moves the MMC initialization earlier in
the init process.

This patch also cleans up the env_relocate_spec code in env_mmc.c

Signed-off-by: Steve Sakoman <steve.sakoman@linaro.org>
Acked-by: Stefano Babic <sbabic@denx.de>
arch/arm/lib/board.c
common/env_mmc.c

index 22bd2c9b0e2e9bc81e6fee8969356a48ee990382..108e6c40c4cf84daa8a544a2c19bf65d8a522f9f 100644 (file)
@@ -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
index cc288d487c2e0d7d05df001154d1e4470d47fb74..d443ff51f1a8f8a528ae37b0e996fe9e39d6ddfd 100644 (file)
@@ -129,18 +129,21 @@ inline int read_env(struct mmc *mmc, unsigned long size,
 void env_relocate_spec(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
+       char buf[CONFIG_ENV_SIZE];
+
        struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
 
-       if (init_mmc_for_env(mmc))
+       if (init_mmc_for_env(mmc)) {
+               use_default();
                return;
+       }
 
-       if (read_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, env_ptr))
-               return use_default();
-
-       if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc)
-               return use_default();
+       if (read_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) {
+               use_default();
+               return;
+       }
 
-       gd->env_valid = 1;
+       env_import(buf, 1);
 #endif
 }