Merge git://git.denx.de/u-boot-marvell

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

diff --git a/env/flash.c b/env/flash.c
index 2d72c51622ff5d7198e28cf476604b39588267d4..bac10ff98561232e88adeba9f83f70f6e9ce43cb 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
@@ -308,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)) {
@@ -352,6 +352,8 @@ static void env_flash_load(void)
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
        env_import((char *)flash_addr, 1);
+
+       return 0;
 }
 #endif /* LOADENV */