imx: hab: Check if CSF contains deprecated commands

[people/ms/u-boot.git] / env / flash.c

diff --git a/env/flash.c b/env/flash.c
index 6ec9b61883a4c3f2d9db70d7f9b9010bf1263ba6..ccade77ce388d15b98fa049ff6f85311fd110661 100644 (file)
--- a/env/flash.c
+++ b/env/flash.c
@@ -45,8 +45,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define INITENV
 #endif
 
-char *env_name_spec = "Flash";
-
 #ifdef ENV_IS_EMBEDDED
 env_t *env_ptr = &environment;
 
@@ -96,7 +94,7 @@ static int env_flash_init(void)
                gd->env_valid   = ENV_VALID;
        } else if (!crc1_ok && !crc2_ok) {
                gd->env_addr    = addr_default;
-               gd->env_valid   = 0;
+               gd->env_valid   = ENV_INVALID;
        } else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) {
                gd->env_addr    = addr1;
                gd->env_valid   = ENV_VALID;
@@ -233,7 +231,7 @@ static int env_flash_init(void)
        }
 
        gd->env_addr    = (ulong)&default_environment[0];
-       gd->env_valid   = 0;
+       gd->env_valid   = ENV_INVALID;
        return 0;
 }
 #endif
@@ -310,7 +308,7 @@ done:
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
 #ifdef LOADENV
-static void env_flash_load(void)
+static int env_flash_load(void)
 {
 #ifdef CONFIG_ENV_ADDR_REDUND
        if (gd->env_addr != (ulong)&(flash_addr->data)) {
@@ -353,12 +351,13 @@ static void env_flash_load(void)
                     "reading environment; recovered successfully\n\n");
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
-       env_import((char *)flash_addr, 1);
+       return env_import((char *)flash_addr, 1);
 }
 #endif /* LOADENV */
 
 U_BOOT_ENV_LOCATION(flash) = {
        .location       = ENVL_FLASH,
+       ENV_NAME("Flash")
 #ifdef LOADENV
        .load           = env_flash_load,
 #endif