env: Relocate env drivers if manual reloc is required

[u-boot] / env / flash.c

diff --git a/env/flash.c b/env/flash.c
index b60be57a8dd1585bcc9edb895e9d00dce1f4d789..ccade77ce388d15b98fa049ff6f85311fd110661 100644 (file)
--- a/env/flash.c
+++ b/env/flash.c
@@ -94,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;
@@ -231,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
@@ -351,9 +351,7 @@ static int env_flash_load(void)
                     "reading environment; recovered successfully\n\n");
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
-       env_import((char *)flash_addr, 1);
-
-       return 0;
+       return env_import((char *)flash_addr, 1);
 }
 #endif /* LOADENV */