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_sf.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_sf.c')
| -rw-r--r-- | common/env_sf.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/common/env_sf.c b/common/env_sf.c index be270f21bc..37ab13ae17 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -47,8 +47,7 @@ static struct spi_flash *env_flash; int saveenv(void) { env_t env_new; - ssize_t len; - char *res, *saved_buffer = NULL, flag = OBSOLETE_FLAG; + char *saved_buffer = NULL, flag = OBSOLETE_FLAG; u32 saved_size, saved_offset, sector = 1; int ret; @@ -62,13 +61,9 @@ int saveenv(void) } } - 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; env_new.flags = ACTIVE_FLAG; if (gd->env_valid == 1) { @@ -225,10 +220,9 @@ out: int saveenv(void) { u32 saved_size, saved_offset, sector = 1; - char *res, *saved_buffer = NULL; + char *saved_buffer = NULL; int ret = 1; env_t env_new; - ssize_t len; if (!env_flash) { env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, @@ -260,13 +254,9 @@ int saveenv(void) sector++; } - 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 = env_export(&env_new); + if (ret) goto done; - } - env_new.crc = crc32(0, env_new.data, ENV_SIZE); puts("Erasing SPI flash..."); ret = spi_flash_erase(env_flash, CONFIG_ENV_OFFSET, |
