summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/Kconfig1
-rw-r--r--env/remote.c13
2 files changed, 1 insertions, 13 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig
index f47ce7f45ce..ff6ad37fbe4 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -717,6 +717,7 @@ config CMD_GREPENV
config CMD_SAVEENV
bool "saveenv"
+ depends on !(SRIO_PCIE_BOOT_SLAVE && ENV_IS_IN_REMOTE)
default y
help
Save all environment variables into the compiled-in persistent
diff --git a/env/remote.c b/env/remote.c
index 0cc383c2360..5dd929155a4 100644
--- a/env/remote.c
+++ b/env/remote.c
@@ -31,18 +31,6 @@ static int env_remote_init(void)
return -ENOENT;
}
-#ifdef CONFIG_CMD_SAVEENV
-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");
- return 1;
-#else
- return 0;
-#endif
-}
-#endif /* CONFIG_CMD_SAVEENV */
-
static int env_remote_load(void)
{
#ifndef ENV_IS_EMBEDDED
@@ -56,6 +44,5 @@ 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,
};