Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/env/nowhere.c b/env/nowhere.c
index 1a17d6978b90026525445fe9dbd6f55aaca47dd9..f654883c8acb1fa64b6667cada1943d491fe0c9f 100644 (file)
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -15,9 +15,20 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
+/*
+ * Because we only ever have the default environment available we must mark
+ * it as invalid.
+ */
+static int env_nowhere_init(void)
+{
+       gd->env_addr    = (ulong)&default_environment[0];
+       gd->env_valid   = ENV_INVALID;
+
+       return 0;
+}
 
 U_BOOT_ENV_LOCATION(nowhere) = {
        .location       = ENVL_NOWHERE,
+       .init           = env_nowhere_init,
        ENV_NAME("nowhere")
 };