summaryrefslogtreecommitdiffstats
path: root/common/env_fat.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_fat.c
parentb401b73d02bb4f97197830e565f19a65577fecc6 (diff)
downloadblackbird-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_fat.c')
-rw-r--r--common/env_fat.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/common/env_fat.c b/common/env_fat.c
index 708fd13dc7..aad0487c32 100644
--- a/common/env_fat.c
+++ b/common/env_fat.c
@@ -37,19 +37,14 @@ int env_init(void)
int saveenv(void)
{
env_t env_new;
- ssize_t len;
- char *res;
block_dev_desc_t *dev_desc = NULL;
int dev = FAT_ENV_DEVICE;
int part = FAT_ENV_PART;
int err;
- 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;
- }
+ err = env_export(&env_new);
+ if (err)
+ return err;
#ifdef CONFIG_MMC
if (strcmp(FAT_ENV_INTERFACE, "mmc") == 0) {
@@ -79,7 +74,6 @@ int saveenv(void)
return 1;
}
- env_new.crc = crc32(0, env_new.data, ENV_SIZE);
err = file_fat_write(FAT_ENV_FILE, (void *)&env_new, sizeof(env_t));
if (err == -1) {
printf("\n** Unable to write \"%s\" from %s%d:%d **\n",
OpenPOWER on IntegriCloud