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_ubi.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_ubi.c')
| -rw-r--r-- | common/env_ubi.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/common/env_ubi.c b/common/env_ubi.c index c0828a47d3..77bbfa6ef4 100644 --- a/common/env_ubi.c +++ b/common/env_ubi.c @@ -37,15 +37,11 @@ static unsigned char env_flags; int saveenv(void) { ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); - ssize_t len; - char *res; + int ret; - 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; - } + ret = env_export(env_new); + if (ret) + return ret; if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) { printf("\n** Cannot find mtd partition \"%s\"\n", @@ -53,7 +49,6 @@ int saveenv(void) return 1; } - env_new->crc = crc32(0, env_new->data, ENV_SIZE); env_new->flags = ++env_flags; /* increase the serial */ if (gd->env_valid == 1) { @@ -86,15 +81,11 @@ int saveenv(void) int saveenv(void) { ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); - ssize_t len; - char *res; + int ret; - 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; - } + ret = env_export(env_new); + if (ret) + return ret; if (ubi_part(CONFIG_ENV_UBI_PART, NULL)) { printf("\n** Cannot find mtd partition \"%s\"\n", @@ -102,8 +93,6 @@ int saveenv(void) return 1; } - env_new->crc = crc32(0, env_new->data, ENV_SIZE); - if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME, (void *)env_new, CONFIG_ENV_SIZE)) { printf("\n** Unable to write env to %s:%s **\n", |
