Merge branch 'u-boot/master'

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

diff --git a/common/env_mmc.c b/common/env_mmc.c
index d42168b7737852db3bda78ea83bf9bd4b0d6e3f1..7da10e61afbba4733fddf5bbbcd11f0006a396b0 100644 (file)
--- a/common/env_mmc.c
+++ b/common/env_mmc.c
@@ -129,8 +129,6 @@ 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;
@@ -138,15 +136,9 @@ int saveenv(void)
        if (init_mmc_for_env(mmc))
                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;
+       ret = env_export(env_new);
+       if (ret)
                goto fini;
-       }
-
-       env_new->crc = crc32(0, &env_new->data[0], ENV_SIZE);
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
        env_new->flags  = ++env_flags; /* increase the serial */
@@ -220,12 +212,6 @@ void env_relocate_spec(void)
 
        mmc = find_mmc_device(dev);
 
-       if (tmp_env1 == NULL || tmp_env2 == NULL) {
-               puts("Can't allocate buffers for environment\n");
-               ret = 1;
-               goto err;
-       }
-
        if (init_mmc_for_env(mmc)) {
                ret = 1;
                goto err;