Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

[platform/kernel/u-boot.git] / env / flash.c

diff --git a/env/flash.c b/env/flash.c
index 3198147..1e75f8c 100644 (file)
--- a/env/flash.c
+++ b/env/flash.c
@@ -13,8 +13,8 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
-#include <flash.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <search.h>
@@ -25,6 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifndef CONFIG_SPL_BUILD
 # if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
+#  include <flash.h>
 #  define CMD_SAVEENV
 # elif defined(CONFIG_ENV_ADDR_REDUND)
 #  error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
@@ -76,7 +77,6 @@ static int env_flash_init(void)
        uchar flag1 = flash_addr->flags;
        uchar flag2 = flash_addr_new->flags;
 
-       ulong addr_default = (ulong)&default_environment[0];
        ulong addr1 = (ulong)&(flash_addr->data);
        ulong addr2 = (ulong)&(flash_addr_new->data);
 
@@ -91,7 +91,6 @@ static int env_flash_init(void)
                gd->env_addr    = addr2;
                gd->env_valid   = ENV_VALID;
        } else if (!crc1_ok && !crc2_ok) {
-               gd->env_addr    = addr_default;
                gd->env_valid   = ENV_INVALID;
        } else if (flag1 == ENV_REDUND_ACTIVE &&
                   flag2 == ENV_REDUND_OBSOLETE) {
@@ -209,8 +208,7 @@ static int env_flash_save(void)
 perror:
        flash_perror(rc);
 done:
-       if (saved_data)
-               free(saved_data);
+       free(saved_data);
        /* try to re-protect */
        flash_sect_protect(1, (ulong)flash_addr, end_addr);
        flash_sect_protect(1, (ulong)flash_addr_new, end_addr_new);
@@ -230,8 +228,7 @@ static int env_flash_init(void)
                return 0;
        }
 
-       gd->env_addr    = (ulong)&default_environment[0];
-       gd->env_valid   = ENV_INVALID;
+       gd->env_valid = ENV_INVALID;
        return 0;
 }
 #endif
@@ -297,8 +294,7 @@ static int env_flash_save(void)
 perror:
        flash_perror(rc);
 done:
-       if (saved_data)
-               free(saved_data);
+       free(saved_data);
        /* try to re-protect */
        flash_sect_protect(1, (long)flash_addr, end_addr);
        return rc;
@@ -351,7 +347,7 @@ static int env_flash_load(void)
                     "reading environment; recovered successfully\n\n");
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
-       return env_import((char *)flash_addr, 1);
+       return env_import((char *)flash_addr, 1, H_EXTERNAL);
 }
 #endif /* LOADENV */