env: mmc: Add missing eMMC bootpart restoration to env erase

[J-u-boot.git] / env / nowhere.c

diff --git a/env/nowhere.c b/env/nowhere.c
index 7db4eec84560e7db6e7156d77abaf45a3b2fe360..1fcf5034535bb137d6c755a463bb740a9cb20542 100644 (file)
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -10,7 +10,8 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
 #include <common.h>
 #include <command.h>
 #include <env.h>

-#include <environment.h>
+#include <env_internal.h>
+#include <asm/global_data.h>

 #include <linux/stddef.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 #include <linux/stddef.h>
 
 DECLARE_GLOBAL_DATA_PTR;


@@ -27,8 +28,24 @@ static int env_nowhere_init(void)
        return 0;
 }
 
        return 0;
 }
 

+static int env_nowhere_load(void)
+{
+       /*
+        * For SPL, setting env_valid = ENV_INVALID is enough, as env_get()
+        * searches default_environment array in that case.
+        * For U-Boot proper, import the default environment to allow reload.
+        */
+       if (!IS_ENABLED(CONFIG_SPL_BUILD))
+               env_set_default(NULL, 0);
+
+       gd->env_valid   = ENV_INVALID;
+
+       return 0;
+}
+

 U_BOOT_ENV_LOCATION(nowhere) = {
        .location       = ENVL_NOWHERE,
        .init           = env_nowhere_init,
 U_BOOT_ENV_LOCATION(nowhere) = {
        .location       = ENVL_NOWHERE,
        .init           = env_nowhere_init,

+       .load           = env_nowhere_load,

        ENV_NAME("nowhere")
 };
        ENV_NAME("nowhere")
 };