ARM: relocate: Fix Thumb code by using proper label type

[platform/kernel/u-boot.git] / env / nowhere.c

diff --git a/env/nowhere.c b/env/nowhere.c
index f5b0a17..9ebc357 100644 (file)
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -21,8 +22,22 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 static int env_nowhere_init(void)
 {
-       gd->env_addr    = (ulong)&default_environment[0];
-       gd->env_valid   = ENV_INVALID;
+       gd->env_valid = ENV_INVALID;
+
+       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;
 }
@@ -30,5 +45,6 @@ static int env_nowhere_init(void)
 U_BOOT_ENV_LOCATION(nowhere) = {
        .location       = ENVL_NOWHERE,
        .init           = env_nowhere_init,
+       .load           = env_nowhere_load,
        ENV_NAME("nowhere")
 };