diff options
| author | Marek Vasut <marex@denx.de> | 2014-03-05 19:59:50 +0100 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-21 16:43:59 -0400 |
| commit | 7ce1526ed2bf7a7499a843d38b30095fa2894659 (patch) | |
| tree | 4cfcf6050115137a4ff027e21ab2fcbf61c58359 /common/env_nand.c | |
| parent | b401b73d02bb4f97197830e565f19a65577fecc6 (diff) | |
| download | blackbird-obmc-uboot-7ce1526ed2bf7a7499a843d38b30095fa2894659.tar.gz blackbird-obmc-uboot-7ce1526ed2bf7a7499a843d38b30095fa2894659.zip | |
env: Add env_export() wrapper
Implement env_export() wrapper, so that all implementers of saveenv() don't
have to call hexport_r(), crc32() etc. sequence . This trims down a bit of
code duplication.
Signed-off-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'common/env_nand.c')
| -rw-r--r-- | common/env_nand.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/common/env_nand.c b/common/env_nand.c index 695a9eebb0..5a734a9321 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -181,8 +181,6 @@ int saveenv(void) { int ret = 0; ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); - ssize_t len; - char *res; int env_idx = 0; static const struct env_location location[] = { { @@ -207,13 +205,10 @@ int saveenv(void) if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE) 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); - return 1; - } - env_new->crc = crc32(0, env_new->data, ENV_SIZE); + ret = env_export(env_new); + if (ret) + return ret; + #ifdef CONFIG_ENV_OFFSET_REDUND env_new->flags = ++env_flags; /* increase the serial */ env_idx = (gd->env_valid == 1); |
