spi: omap3_spi: add am43xx support to omap3_spi

[karo-tx-uboot.git] / common / env_mmc.c

diff --git a/common/env_mmc.c b/common/env_mmc.c
index f47bd777256f0bdee6252d69eaa940010620f1d0..6c4ce2f05d83aff57e72c20ab86e198f7ce4b871 100644 (file)
--- a/common/env_mmc.c
+++ b/common/env_mmc.c
@@ -62,36 +62,46 @@ int env_init(void)
        return 0;
 }
 
-static int init_mmc_for_env(struct mmc *mmc)
-{
 #ifdef CONFIG_SYS_MMC_ENV_PART
+__weak uint mmc_get_env_part(struct mmc *mmc)
+{
+       return CONFIG_SYS_MMC_ENV_PART;
+}
+
+static int mmc_set_env_part(struct mmc *mmc)
+{
+       uint part = mmc_get_env_part(mmc);
        int dev = CONFIG_SYS_MMC_ENV_DEV;
+       int ret = 0;
 
 #ifdef CONFIG_SPL_BUILD
        dev = 0;
-#endif
 #endif
 
-       if (!mmc) {
-               puts("No MMC card found\n");
-               return -1;
-       }
-
-       if (mmc_init(mmc)) {
-               puts("MMC init failed\n");
-               return -1;
-       }
-
-#ifdef CONFIG_SYS_MMC_ENV_PART
-       if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num) {
-               if (mmc_switch_part(dev, CONFIG_SYS_MMC_ENV_PART)) {
+       if (part != mmc->part_num) {
+               ret = mmc_switch_part(dev, part);
+               if (ret)
                        puts("MMC partition switch failed\n");
-                       return -1;
-               }
        }
+
+       return ret;
+}
+#else
+static inline int mmc_set_env_part(struct mmc *mmc) {return 0; };
 #endif
 
-       return 0;
+static const char *init_mmc_for_env(struct mmc *mmc)
+{
+       if (!mmc)
+               return "No MMC card found";
+
+       if (mmc_init(mmc))
+               return "MMC init failed";
+
+       if (mmc_set_env_part(mmc))
+               return "MMC partition switch failed";
+
+       return NULL;
 }
 
 static void fini_mmc_for_env(struct mmc *mmc)
@@ -102,7 +112,7 @@ static void fini_mmc_for_env(struct mmc *mmc)
 #ifdef CONFIG_SPL_BUILD
        dev = 0;
 #endif
-       if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num)
+       if (mmc_get_env_part(mmc) != mmc->part_num)
                mmc_switch_part(dev, mmc->part_num);
 #endif
 }
@@ -129,24 +139,20 @@ static unsigned char env_flags;
 int saveenv(void)
 {
        ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
-       ssize_t len;
-       char    *res;
        struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
        u32     offset;
        int     ret, copy = 0;
+       const char *errmsg;
 
-       if (init_mmc_for_env(mmc))
+       errmsg = init_mmc_for_env(mmc);
+       if (errmsg) {
+               printf("%s\n", errmsg);
                return 1;
-
-       res = (char *)&env_new->data;
-       len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
-       if (len < 0) {
-               error("Cannot export environment: errno = %d\n", errno);
-               ret = 1;
-               goto fini;
        }
 
-       env_new->crc = crc32(0, &env_new->data[0], ENV_SIZE);
+       ret = env_export(env_new);
+       if (ret)
+               goto fini;
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
        env_new->flags  = ++env_flags; /* increase the serial */
@@ -210,6 +216,7 @@ void env_relocate_spec(void)
        env_t *ep;
        int ret;
        int dev = CONFIG_SYS_MMC_ENV_DEV;
+       const char *errmsg = NULL;
 
        ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env1, 1);
        ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env2, 1);
@@ -220,7 +227,8 @@ void env_relocate_spec(void)
 
        mmc = find_mmc_device(dev);
 
-       if (init_mmc_for_env(mmc)) {
+       errmsg = init_mmc_for_env(mmc);
+       if (errmsg) {
                ret = 1;
                goto err;
        }
@@ -246,6 +254,7 @@ void env_relocate_spec(void)
                (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
 
        if (!crc1_ok && !crc2_ok) {
+               errmsg = "!bad CRC";
                ret = 1;
                goto fini;
        } else if (crc1_ok && !crc2_ok) {
@@ -281,8 +290,7 @@ fini:
        fini_mmc_for_env(mmc);
 err:
        if (ret)
-               set_default_env(NULL);
-
+               set_default_env(errmsg);
 #endif
 }
 #else /* ! CONFIG_ENV_OFFSET_REDUND */
@@ -294,6 +302,7 @@ void env_relocate_spec(void)
        u32 offset;
        int ret;
        int dev = CONFIG_SYS_MMC_ENV_DEV;
+       const char *errmsg;
 
 #ifdef CONFIG_SPL_BUILD
        dev = 0;
@@ -301,7 +310,8 @@ void env_relocate_spec(void)
 
        mmc = find_mmc_device(dev);
 
-       if (init_mmc_for_env(mmc)) {
+       errmsg = init_mmc_for_env(mmc);
+       if (errmsg) {
                ret = 1;
                goto err;
        }
@@ -312,6 +322,7 @@ void env_relocate_spec(void)
        }
 
        if (read_env(mmc, CONFIG_ENV_SIZE, offset, buf)) {
+               errmsg = "!read failed";
                ret = 1;
                goto fini;
        }
@@ -323,7 +334,7 @@ fini:
        fini_mmc_for_env(mmc);
 err:
        if (ret)
-               set_default_env(NULL);
+               set_default_env(errmsg);
 #endif
 }
 #endif /* CONFIG_ENV_OFFSET_REDUND */