env: clean env_mmc.c checkpatch and code style

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

diff --git a/common/env_mmc.c b/common/env_mmc.c
index 14203b6e2eef617340399d2be4c0bc9c0285d280..8441c77ead7e81d677ba0bf6031828b226432ab6 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,25 +29,30 @@
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <mmc.h>
-
-/* references to names in env_common.c */
-extern uchar default_environment[];
+#include <search.h>
+#include <errno.h>
 
 char *env_name_spec = "MMC";
 
 #ifdef ENV_IS_EMBEDDED
-extern uchar environment[];
-env_t *env_ptr = (env_t *)(&environment[0]);
+env_t *env_ptr = &environment;
 #else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr = NULL;
+env_t *env_ptr;
 #endif /* ENV_IS_EMBEDDED */
 
-/* local functions */
-#if !defined(ENV_IS_EMBEDDED)
-static void use_default(void);
+DECLARE_GLOBAL_DATA_PTR;
+
+#if !defined(CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_OFFSET 0
 #endif
 
-DECLARE_GLOBAL_DATA_PTR;
+static int __mmc_get_env_addr(struct mmc *mmc, u32 *env_addr)
+{
+       *env_addr = CONFIG_ENV_OFFSET;
+       return 0;
+}
+int mmc_get_env_addr(struct mmc *mmc, u32 *env_addr)
+       __attribute__((weak, alias("__mmc_get_env_addr")));
 
 uchar env_get_char_spec(int index)
 {
@@ -57,13 +62,13 @@ uchar env_get_char_spec(int index)
 int env_init(void)
 {
        /* use default */
-       gd->env_addr = (ulong)&default_environment[0];
-       gd->env_valid = 1;
+       gd->env_addr    = (ulong)&default_environment[0];
+       gd->env_valid   = 1;
 
        return 0;
 }
 
-int init_mmc_for_env(struct mmc *mmc)
+static int init_mmc_for_env(struct mmc *mmc)
 {
        if (!mmc) {
                puts("No MMC card found\n");
@@ -72,21 +77,20 @@ int init_mmc_for_env(struct mmc *mmc)
 
        if (mmc_init(mmc)) {
                puts("MMC init failed\n");
-               return  -1;
+               return -1;
        }
 
        return 0;
 }
 
 #ifdef CONFIG_CMD_SAVEENV
-
-inline int write_env(struct mmc *mmc, unsigned long size,
-                       unsigned long offset, const void *buffer)
+static inline int write_env(struct mmc *mmc, unsigned long size,
+                           unsigned long offset, const void *buffer)
 {
        uint blk_start, blk_cnt, n;
 
-       blk_start = ALIGN(offset, mmc->write_bl_len) / mmc->write_bl_len;
-       blk_cnt   = ALIGN(size, mmc->write_bl_len) / mmc->write_bl_len;
+       blk_start       = ALIGN(offset, mmc->write_bl_len) / mmc->write_bl_len;
+       blk_cnt         = ALIGN(size, mmc->write_bl_len) / mmc->write_bl_len;
 
        n = mmc->block_dev.block_write(CONFIG_SYS_MMC_ENV_DEV, blk_start,
                                        blk_cnt, (u_char *)buffer);
@@ -96,13 +100,25 @@ 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))
+       if (init_mmc_for_env(mmc) || 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;
        }
@@ -112,13 +128,13 @@ int saveenv(void)
 }
 #endif /* CONFIG_CMD_SAVEENV */
 
-inline int read_env(struct mmc *mmc, unsigned long size,
-                       unsigned long offset, const void *buffer)
+static inline int read_env(struct mmc *mmc, unsigned long size,
+                          unsigned long offset, const void *buffer)
 {
        uint blk_start, blk_cnt, n;
 
-       blk_start = ALIGN(offset, mmc->read_bl_len) / mmc->read_bl_len;
-       blk_cnt   = ALIGN(size, mmc->read_bl_len) / mmc->read_bl_len;
+       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);
@@ -129,25 +145,16 @@ 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))
-               return;
+       if (init_mmc_for_env(mmc) || mmc_get_env_addr(mmc, &offset))
+               return set_default_env(NULL);
 
-       if (read_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, env_ptr))
-               return use_default();
+       if (read_env(mmc, CONFIG_ENV_SIZE, offset, buf))
+               return set_default_env(NULL);
 
-       if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc)
-               return use_default();
-
-       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();
-}
-#endif