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 9ca098fa674dbb56911ed1ab3517152d6db84f3c..7da10e61afbba4733fddf5bbbcd11f0006a396b0 100644 (file)
--- a/common/env_mmc.c
+++ b/common/env_mmc.c
@@ -1,23 +1,7 @@
 /*
  * (C) Copyright 2008-2011 Freescale Semiconductor, Inc.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /* #define DEBUG */
@@ -53,11 +37,19 @@ DECLARE_GLOBAL_DATA_PTR;
 
 __weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr)
 {
-       *env_addr = CONFIG_ENV_OFFSET;
+       s64 offset;
+
+       offset = CONFIG_ENV_OFFSET;
 #ifdef CONFIG_ENV_OFFSET_REDUND
        if (copy)
-               *env_addr = CONFIG_ENV_OFFSET_REDUND;
+               offset = CONFIG_ENV_OFFSET_REDUND;
 #endif
+
+       if (offset < 0)
+               offset += mmc->capacity;
+
+       *env_addr = offset;
+
        return 0;
 }
 
@@ -72,6 +64,14 @@ int env_init(void)
 
 static int init_mmc_for_env(struct mmc *mmc)
 {
+#ifdef CONFIG_SYS_MMC_ENV_PART
+       int dev = CONFIG_SYS_MMC_ENV_DEV;
+
+#ifdef CONFIG_SPL_BUILD
+       dev = 0;
+#endif
+#endif
+
        if (!mmc) {
                puts("No MMC card found\n");
                return -1;
@@ -84,8 +84,7 @@ static int init_mmc_for_env(struct mmc *mmc)
 
 #ifdef CONFIG_SYS_MMC_ENV_PART
        if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num) {
-               if (mmc_switch_part(CONFIG_SYS_MMC_ENV_DEV,
-                                   CONFIG_SYS_MMC_ENV_PART)) {
+               if (mmc_switch_part(dev, CONFIG_SYS_MMC_ENV_PART)) {
                        puts("MMC partition switch failed\n");
                        return -1;
                }
@@ -98,9 +97,13 @@ static int init_mmc_for_env(struct mmc *mmc)
 static void fini_mmc_for_env(struct mmc *mmc)
 {
 #ifdef CONFIG_SYS_MMC_ENV_PART
+       int dev = CONFIG_SYS_MMC_ENV_DEV;
+
+#ifdef CONFIG_SPL_BUILD
+       dev = 0;
+#endif
        if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num)
-               mmc_switch_part(CONFIG_SYS_MMC_ENV_DEV,
-                               mmc->part_num);
+               mmc_switch_part(dev, mmc->part_num);
 #endif
 }
 
@@ -126,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;
@@ -135,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 */
@@ -182,12 +177,16 @@ static inline int read_env(struct mmc *mmc, unsigned long size,
                           unsigned long offset, const void *buffer)
 {
        uint blk_start, blk_cnt, n;
+       int dev = CONFIG_SYS_MMC_ENV_DEV;
+
+#ifdef CONFIG_SPL_BUILD
+       dev = 0;
+#endif
 
        blk_start       = ALIGN(offset, mmc->read_bl_len) / mmc->read_bl_len;
        blk_cnt         = ALIGN(size, mmc->read_bl_len) / mmc->read_bl_len;
 
-       n = mmc->block_dev.block_read(CONFIG_SYS_MMC_ENV_DEV, blk_start,
-                                       blk_cnt, (uchar *)buffer);
+       n = mmc->block_dev.block_read(dev, blk_start, blk_cnt, (uchar *)buffer);
 
        return (n == blk_cnt) ? 0 : -1;
 }
@@ -196,20 +195,22 @@ static inline int read_env(struct mmc *mmc, unsigned long size,
 void env_relocate_spec(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
-       struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+       struct mmc *mmc;
        u32 offset1, offset2;
        int read1_fail = 0, read2_fail = 0;
        int crc1_ok = 0, crc2_ok = 0;
-       env_t *ep, *tmp_env1, *tmp_env2;
+       env_t *ep;
        int ret;
+       int dev = CONFIG_SYS_MMC_ENV_DEV;
 
-       tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE);
-       tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);
-       if (tmp_env1 == NULL || tmp_env2 == NULL) {
-               puts("Can't allocate buffers for environment\n");
-               ret = 1;
-               goto err;
-       }
+       ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env1, 1);
+       ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env2, 1);
+
+#ifdef CONFIG_SPL_BUILD
+       dev = 0;
+#endif
+
+       mmc = find_mmc_device(dev);
 
        if (init_mmc_for_env(mmc)) {
                ret = 1;
@@ -274,8 +275,6 @@ err:
        if (ret)
                set_default_env(NULL);
 
-       free(tmp_env1);
-       free(tmp_env2);
 #endif
 }
 #else /* ! CONFIG_ENV_OFFSET_REDUND */
@@ -283,9 +282,16 @@ void env_relocate_spec(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
        ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
-       struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+       struct mmc *mmc;
        u32 offset;
        int ret;
+       int dev = CONFIG_SYS_MMC_ENV_DEV;
+
+#ifdef CONFIG_SPL_BUILD
+       dev = 0;
+#endif
+
+       mmc = find_mmc_device(dev);
 
        if (init_mmc_for_env(mmc)) {
                ret = 1;