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

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

diff --git a/env/nvram.c b/env/nvram.c
index 0f4b491fd3b688868d21fcae80a918565fcbda37..261b31edfbb9303d8a8ffb9d07e322e0e003f30f 100644 (file)
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  *
  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Andreas Heppel <[email protected]>
-
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -26,33 +25,24 @@
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
+#include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
 extern void *nvram_read(void *dest, const long src, size_t count);
 extern void nvram_write(long dest, const void *src, size_t count);
-env_t *env_ptr;
 #else
-env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
-#endif
-
-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-static uchar env_nvram_get_char(int index)
-{
-       uchar c;
-
-       nvram_read(&c, CONFIG_ENV_ADDR + index, 1);
-
-       return c;
-}
+static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
 
-static void env_nvram_load(void)
+static int env_nvram_load(void)
 {
        char buf[CONFIG_ENV_SIZE];
 
@@ -61,7 +51,7 @@ static void env_nvram_load(void)
 #else
        memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #endif
-       env_import(buf, 1);
+       return env_import(buf, 1, H_EXTERNAL);
 }
 
 static int env_nvram_save(void)
@@ -105,7 +95,7 @@ static int env_nvram_init(void)
                gd->env_valid = ENV_VALID;
        } else {
                gd->env_addr    = (ulong)&default_environment[0];
-               gd->env_valid   = 0;
+               gd->env_valid   = ENV_INVALID;
        }
 
        return 0;
@@ -114,9 +104,6 @@ static int env_nvram_init(void)
 U_BOOT_ENV_LOCATION(nvram) = {
        .location       = ENVL_NVRAM,
        ENV_NAME("NVRAM")
-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-       .get_char       = env_nvram_get_char,
-#endif
        .load           = env_nvram_load,
        .save           = env_save_ptr(env_nvram_save),
        .init           = env_nvram_init,