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

[u-boot] / env / nowhere.c

diff --git a/env/nowhere.c b/env/nowhere.c
index 6a67ab09ff624320bd55d1be96699e425f0a43c8..f654883c8acb1fa64b6667cada1943d491fe0c9f 100644 (file)
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -15,27 +15,20 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
-
-static void env_nowhere_load(void)
-{
-}
-
 /*
- * Initialize Environment use
- *
- * We are still running from ROM, so data use is limited
+ * 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   = 0;
+       gd->env_valid   = ENV_INVALID;
 
        return 0;
 }
 
 U_BOOT_ENV_LOCATION(nowhere) = {
        .location       = ENVL_NOWHERE,
-       .load           = env_nowhere_load,
        .init           = env_nowhere_init,
+       ENV_NAME("nowhere")
 };