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

[u-boot] / env / remote.c

diff --git a/env/remote.c b/env/remote.c
index e003e02fb9ec6c8ec8035a220eeec049bcc941de..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 */
@@ -25,7 +23,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define CONFIG_ENV_OFFSET 0
 #endif
 
-int env_init(void)
+static int env_remote_init(void)
 {
        if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
                gd->env_addr = (ulong)&(env_ptr->data);
@@ -33,13 +31,11 @@ int env_init(void)
                return 0;
        }
 
-       gd->env_addr = (ulong)default_environment;
-       gd->env_valid = 0;
-       return 0;
+       return -ENOENT;
 }
 
 #ifdef CONFIG_CMD_SAVEENV
-int saveenv(void)
+static int env_remote_save(void)
 {
 #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
        printf("Can not support the 'saveenv' when boot from SRIO or PCIE!\n");
@@ -50,9 +46,19 @@ int saveenv(void)
 }
 #endif /* CONFIG_CMD_SAVEENV */
 
-void env_relocate_spec(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,
+};