Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/common/env_mmc.c b/common/env_mmc.c
index 14203b6e2eef617340399d2be4c0bc9c0285d280..12d647a826de078d4c56c7cb80727feecf620198 100644 (file)
--- a/common/env_mmc.c
+++ b/common/env_mmc.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
+ * (C) Copyright 2008-2011 Freescale Semiconductor, Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -29,6 +29,8 @@
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <search.h>
+#include <errno.h>
 
 /* references to names in env_common.c */
 extern uchar default_environment[];
@@ -49,6 +51,19 @@ static void use_default(void);
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#if !defined(CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_OFFSET 0
+#endif
+
+static int __mmc_get_env_addr(struct mmc *mmc, u32 *env_addr)
+{
+       *env_addr = CONFIG_ENV_OFFSET;
+       return 0;
+}
+__attribute__((weak, alias("__mmc_get_env_addr")))
+int mmc_get_env_addr(struct mmc *mmc, u32 *env_addr);
+
+
 uchar env_get_char_spec(int index)
 {
        return *((uchar *)(gd->env_addr + index));
@@ -96,13 +111,27 @@ inline int write_env(struct mmc *mmc, unsigned long size,
 
 int saveenv(void)
 {
+       env_t   env_new;
+       ssize_t len;
+       char    *res;
        struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+       u32 offset;
 
        if (init_mmc_for_env(mmc))
                return 1;
 
+       if(mmc_get_env_addr(mmc, &offset))
+               return 1;
+
+       res = (char *)&env_new.data;
+       len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL);
+       if (len < 0) {
+               error("Cannot export environment: errno = %d\n", errno);
+               return 1;
+       }
+       env_new.crc   = crc32(0, env_new.data, ENV_SIZE);
        printf("Writing to MMC(%d)... ", CONFIG_SYS_MMC_ENV_DEV);
-       if (write_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, env_ptr)) {
+       if (write_env(mmc, CONFIG_ENV_SIZE, offset, (u_char *)&env_new)) {
                puts("failed\n");
                return 1;
        }
@@ -129,25 +158,33 @@ 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);
+       u32 offset;
 
-       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(mmc_get_env_addr(mmc, &offset)) {
+               use_default();
+               return ;
+       }
 
-       if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc)
-               return use_default();
+       if (read_env(mmc, CONFIG_ENV_SIZE, offset, buf)) {
+               use_default();
+               return;
+       }
 
-       gd->env_valid = 1;
+       env_import(buf, 1);
 #endif
 }
 
 #if !defined(ENV_IS_EMBEDDED)
 static void use_default()
 {
-       puts ("*** Warning - bad CRC or MMC, using default environment\n\n");
-       set_default_env();
+       set_default_env(NULL);
 }
 #endif