env: nvram: Let generic env_init() assign default environment

env_nvram_init() assigns default environment if ENV_INVALID, but this is
done in the generic env_init() function, which calls this initializer,
so drop it from here.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/env/nvram.c b/env/nvram.c
index 261b31e..297573c 100644 (file)
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -94,8 +94,7 @@ static int env_nvram_init(void)
 #endif
                gd->env_valid = ENV_VALID;
        } else {
-               gd->env_addr    = (ulong)&default_environment[0];
-               gd->env_valid   = ENV_INVALID;
+               gd->env_valid = ENV_INVALID;
        }
 
        return 0;