|
@@ -18,6 +18,7 @@
|
|
|
#include <fat.h>
|
|
|
#include <mmc.h>
|
|
|
#include <asm/cache.h>
|
|
|
+#include <asm/global_data.h>
|
|
|
#include <linux/stddef.h>
|
|
|
|
|
|
#ifdef CONFIG_SPL_BUILD
|
|
@@ -29,6 +30,8 @@
|
|
|
# define LOADENV
|
|
|
#endif
|
|
|
|
|
|
+DECLARE_GLOBAL_DATA_PTR;
|
|
|
+
|
|
|
static char *env_fat_device_and_part(void)
|
|
|
{
|
|
|
#ifdef CONFIG_MMC
|
|
@@ -53,6 +56,7 @@ static int env_fat_save(void)
|
|
|
env_t __aligned(ARCH_DMA_MINALIGN) env_new;
|
|
|
struct blk_desc *dev_desc = NULL;
|
|
|
struct disk_partition info;
|
|
|
+ const char *file = CONFIG_ENV_FAT_FILE;
|
|
|
int dev, part;
|
|
|
int err;
|
|
|
loff_t size;
|
|
@@ -78,29 +82,41 @@ static int env_fat_save(void)
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t),
|
|
|
- &size);
|
|
|
+#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
|
|
+ if (gd->env_valid == ENV_VALID)
|
|
|
+ file = CONFIG_ENV_FAT_FILE_REDUND;
|
|
|
+#endif
|
|
|
+
|
|
|
+ err = file_fat_write(file, (void *)&env_new, 0, sizeof(env_t), &size);
|
|
|
if (err == -1) {
|
|
|
/*
|
|
|
* This printf is embedded in the messages from env_save that
|
|
|
* will calling it. The missing \n is intentional.
|
|
|
*/
|
|
|
printf("Unable to write \"%s\" from %s%d:%d... ",
|
|
|
- CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
|
|
|
+ file, CONFIG_ENV_FAT_INTERFACE, dev, part);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
|
|
+ gd->env_valid = (gd->env_valid == ENV_REDUND) ? ENV_VALID : ENV_REDUND;
|
|
|
+#endif
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
#ifdef LOADENV
|
|
|
static int env_fat_load(void)
|
|
|
{
|
|
|
- ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
|
|
|
+ ALLOC_CACHE_ALIGN_BUFFER(char, buf1, CONFIG_ENV_SIZE);
|
|
|
+#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
|
|
+ ALLOC_CACHE_ALIGN_BUFFER(char, buf2, CONFIG_ENV_SIZE);
|
|
|
+ int err2;
|
|
|
+#endif
|
|
|
struct blk_desc *dev_desc = NULL;
|
|
|
struct disk_partition info;
|
|
|
int dev, part;
|
|
|
- int err;
|
|
|
+ int err1;
|
|
|
|
|
|
#ifdef CONFIG_MMC
|
|
|
if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc"))
|
|
@@ -124,8 +140,15 @@ static int env_fat_load(void)
|
|
|
goto err_env_relocate;
|
|
|
}
|
|
|
|
|
|
- err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE);
|
|
|
- if (err == -1) {
|
|
|
+ err1 = file_fat_read(CONFIG_ENV_FAT_FILE, buf1, CONFIG_ENV_SIZE);
|
|
|
+#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
|
|
+ err2 = file_fat_read(CONFIG_ENV_FAT_FILE_REDUND, buf2, CONFIG_ENV_SIZE);
|
|
|
+
|
|
|
+ err1 = (err1 >= 0) ? 0 : -1;
|
|
|
+ err2 = (err2 >= 0) ? 0 : -1;
|
|
|
+ return env_import_redund(buf1, err1, buf2, err2, H_EXTERNAL);
|
|
|
+#else
|
|
|
+ if (err1 < 0) {
|
|
|
/*
|
|
|
* This printf is embedded in the messages from env_save that
|
|
|
* will calling it. The missing \n is intentional.
|
|
@@ -135,7 +158,8 @@ static int env_fat_load(void)
|
|
|
goto err_env_relocate;
|
|
|
}
|
|
|
|
|
|
- return env_import(buf, 1, H_EXTERNAL);
|
|
|
+ return env_import(buf1, 1, H_EXTERNAL);
|
|
|
+#endif
|
|
|
|
|
|
err_env_relocate:
|
|
|
env_set_default(NULL, 0);
|