arm64: zynqmp: Used fixed-partitions for QSPI in k26

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

diff --git a/env/nvram.c b/env/nvram.c
index 7c8ea26..fb26523 100644 (file)
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -27,6 +27,7 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
@@ -41,20 +42,6 @@ extern void nvram_write(long dest, const void *src, size_t count);
 static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
 
-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-/** Call this function from overridden env_get_char_spec() if you need
- * this functionality.
- */
-int env_nvram_get_char(int index)
-{
-       uchar c;
-
-       nvram_read(&c, CONFIG_ENV_ADDR + index, 1);
-
-       return c;
-}
-#endif
-
 static int env_nvram_load(void)
 {
        char buf[CONFIG_ENV_SIZE];
@@ -100,15 +87,14 @@ static int env_nvram_init(void)
        nvram_read(data, CONFIG_ENV_ADDR + sizeof(ulong), ENV_SIZE);
 
        if (crc32(0, data, ENV_SIZE) == crc) {
-               gd->env_addr    = (ulong)CONFIG_ENV_ADDR + sizeof(long);
+               gd->env_addr = (ulong)CONFIG_ENV_ADDR + sizeof(long);
 #else
        if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
-               gd->env_addr    = (ulong)&env_ptr->data;
+               gd->env_addr = (ulong)&env_ptr->data;
 #endif
                gd->env_valid = ENV_VALID;
        } else {
-               gd->env_addr    = (ulong)&default_environment[0];
-               gd->env_valid   = ENV_INVALID;
+               gd->env_valid = ENV_INVALID;
        }
 
        return 0;