X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fenv_fat.c;h=aad0487c32805aea4ec94e488f498c842e18cef6;hb=24289208354c143967968755cff5c825a12e3f90;hp=bad92aa89ef41dd5e5cad6b4ff609d11183cfa94;hpb=57210c7cc363cf2a2a28010658c7ea67388f8d21;p=u-boot

diff --git a/common/env_fat.c b/common/env_fat.c
index bad92aa89e..aad0487c32 100644
--- a/common/env_fat.c
+++ b/common/env_fat.c
@@ -4,23 +4,7 @@
  * Author:
  *  Maximilian Schwerin <mvs@tigris.de>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
@@ -40,11 +24,6 @@ env_t *env_ptr;
 
 DECLARE_GLOBAL_DATA_PTR;
 
-uchar env_get_char_spec(int index)
-{
-	return *((uchar *)(gd->env_addr + index));
-}
-
 int env_init(void)
 {
 	/* use default */
@@ -58,21 +37,17 @@ 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', &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) {
+	if (strcmp(FAT_ENV_INTERFACE, "mmc") == 0) {
 		struct mmc *mmc = find_mmc_device(dev);
 
 		if (!mmc) {
@@ -91,14 +66,16 @@ int saveenv(void)
 			FAT_ENV_INTERFACE, dev);
 		return 1;
 	}
-	if (fat_register_device(dev_desc, part) != 0) {
+
+	err = fat_register_device(dev_desc, part);
+	if (err) {
 		printf("Failed to register %s%d:%d\n",
 			FAT_ENV_INTERFACE, dev, part);
 		return 1;
 	}
 
-	env_new.crc = crc32(0, env_new.data, ENV_SIZE);
-	if (file_fat_write(FAT_ENV_FILE, (void *)&env_new, sizeof(env_t)) == -1) {
+	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",
 			FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part);
 		return 1;
@@ -115,9 +92,10 @@ void env_relocate_spec(void)
 	block_dev_desc_t *dev_desc = NULL;
 	int dev = FAT_ENV_DEVICE;
 	int part = FAT_ENV_PART;
+	int err;
 
 #ifdef CONFIG_MMC
-	if (strcmp (FAT_ENV_INTERFACE, "mmc") == 0) {
+	if (strcmp(FAT_ENV_INTERFACE, "mmc") == 0) {
 		struct mmc *mmc = find_mmc_device(dev);
 
 		if (!mmc) {
@@ -138,14 +116,17 @@ void env_relocate_spec(void)
 		set_default_env(NULL);
 		return;
 	}
-	if (fat_register_device(dev_desc, part) != 0) {
+
+	err = fat_register_device(dev_desc, part);
+	if (err) {
 		printf("Failed to register %s%d:%d\n",
 			FAT_ENV_INTERFACE, dev, part);
 		set_default_env(NULL);
 		return;
 	}
 
-	if (file_fat_read(FAT_ENV_FILE, (unsigned char *)&buf, CONFIG_ENV_SIZE) == -1) {
+	err = file_fat_read(FAT_ENV_FILE, (uchar *)&buf, CONFIG_ENV_SIZE);
+	if (err == -1) {
 		printf("\n** Unable to read \"%s\" from %s%d:%d **\n",
 			FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part);
 		set_default_env(NULL);