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

[u-boot] / env / remote.c

diff --git a/env/remote.c b/env/remote.c
index c5dce5b9662cb5af1647836745020b0560568561..379d0eb1bb333186cae1c26db32df3b30d1765f1 100644 (file)
--- a/env/remote.c
+++ b/env/remote.c
@@ -11,8 +11,6 @@
 #include <environment.h>
 #include <linux/stddef.h>
 
-char *env_name_spec = "Remote";
-
 #ifdef ENV_IS_EMBEDDED
 env_t *env_ptr = &environment;
 #else /* ! ENV_IS_EMBEDDED */
@@ -48,15 +46,18 @@ static int env_remote_save(void)
 }
 #endif /* CONFIG_CMD_SAVEENV */
 
-static void env_remote_load(void)
+static int env_remote_load(void)
 {
 #ifndef ENV_IS_EMBEDDED
-       env_import((char *)env_ptr, 1);
+       return env_import((char *)env_ptr, 1);
 #endif
+
+       return 0;
 }
 
 U_BOOT_ENV_LOCATION(remote) = {
        .location       = ENVL_REMOTE,
+       ENV_NAME("Remote")
        .load           = env_remote_load,
        .save           = env_save_ptr(env_remote_save),
        .init           = env_remote_init,