summaryrefslogtreecommitdiff
path: root/common/env_flash.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2014-03-05 19:59:50 +0100
committerTom Rini <trini@ti.com>2014-03-21 16:43:59 -0400
commit7ce1526ed2bf7a7499a843d38b30095fa2894659 (patch)
tree4cfcf6050115137a4ff027e21ab2fcbf61c58359 /common/env_flash.c
parentb401b73d02bb4f97197830e565f19a65577fecc6 (diff)
downloadu-boot-imx-7ce1526ed2bf7a7499a843d38b30095fa2894659.zip
u-boot-imx-7ce1526ed2bf7a7499a843d38b30095fa2894659.tar.gz
u-boot-imx-7ce1526ed2bf7a7499a843d38b30095fa2894659.tar.bz2
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_flash.c')
-rw-r--r--common/env_flash.c21
1 files changed, 6 insertions, 15 deletions
diff --git a/common/env_flash.c b/common/env_flash.c
index 7d5a4cf..b3ad908 100644
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -106,8 +106,7 @@ int env_init(void)
int saveenv(void)
{
env_t env_new;
- ssize_t len;
- char *res, *saved_data = NULL;
+ char *saved_data = NULL;
char flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG;
int rc = 1;
#if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE
@@ -125,13 +124,9 @@ int saveenv(void)
if (flash_sect_protect(0, (ulong)flash_addr_new, end_addr_new))
goto done;
- 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);
- goto done;
- }
- env_new.crc = crc32(0, env_new.data, ENV_SIZE);
+ rc = env_export(&env_new);
+ if (rc)
+ return rc;
env_new.flags = new_flag;
#if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE
@@ -258,13 +253,9 @@ int saveenv(void)
if (flash_sect_protect(0, (long)flash_addr, end_addr))
goto done;
- 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);
+ rc = env_export(&env_new);
+ if (rc)
goto done;
- }
- env_new.crc = crc32(0, env_new.data, ENV_SIZE);
puts("Erasing Flash...");
if (flash_sect_erase((long)flash_addr, end_addr))