Merge tag 'efi-2020-01-rc1-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / env / flash.c

diff --git a/env/flash.c b/env/flash.c
index 6ec9b61883a4c3f2d9db70d7f9b9010bf1263ba6..231a5fdf24d0038248759b420ea2747ceabb1593 100644 (file)
--- a/env/flash.c
+++ b/env/flash.c
@@ -1,18 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Andreas Heppel <aheppel@sysgo.de>
-
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /* #define DEBUG */
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <search.h>
@@ -45,18 +45,16 @@ DECLARE_GLOBAL_DATA_PTR;
 #define INITENV
 #endif
 
-char *env_name_spec = "Flash";
-
+#if defined(CONFIG_ENV_ADDR_REDUND) && defined(CMD_SAVEENV) || \
+       !defined(CONFIG_ENV_ADDR_REDUND) && defined(INITENV)
 #ifdef ENV_IS_EMBEDDED
-env_t *env_ptr = &environment;
-
-static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
-
+static env_t *env_ptr = &embedded_environment;
 #else /* ! ENV_IS_EMBEDDED */
 
-env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
-static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
+static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif /* ENV_IS_EMBEDDED */
+#endif
+static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
 
 /* CONFIG_ENV_ADDR is supposed to be on sector boundary */
 static ulong __maybe_unused end_addr =
@@ -96,11 +94,13 @@ static int env_flash_init(void)
                gd->env_valid   = ENV_VALID;
        } else if (!crc1_ok && !crc2_ok) {
                gd->env_addr    = addr_default;
-               gd->env_valid   = 0;
-       } else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) {
+               gd->env_valid   = ENV_INVALID;
+       } else if (flag1 == ENV_REDUND_ACTIVE &&
+                  flag2 == ENV_REDUND_OBSOLETE) {
                gd->env_addr    = addr1;
                gd->env_valid   = ENV_VALID;
-       } else if (flag1 == OBSOLETE_FLAG && flag2 == ACTIVE_FLAG) {
+       } else if (flag1 == ENV_REDUND_OBSOLETE &&
+                  flag2 == ENV_REDUND_ACTIVE) {
                gd->env_addr    = addr2;
                gd->env_valid   = ENV_VALID;
        } else if (flag1 == flag2) {
@@ -123,7 +123,7 @@ static int env_flash_save(void)
 {
        env_t   env_new;
        char    *saved_data = NULL;
-       char    flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG;
+       char    flag = ENV_REDUND_OBSOLETE, new_flag = ENV_REDUND_ACTIVE;
        int     rc = 1;
 #if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE
        ulong   up_data = 0;
@@ -233,7 +233,7 @@ static int env_flash_init(void)
        }
 
        gd->env_addr    = (ulong)&default_environment[0];
-       gd->env_valid   = 0;
+       gd->env_valid   = ENV_INVALID;
        return 0;
 }
 #endif
@@ -310,7 +310,7 @@ done:
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
 #ifdef LOADENV
-static void env_flash_load(void)
+static int env_flash_load(void)
 {
 #ifdef CONFIG_ENV_ADDR_REDUND
        if (gd->env_addr != (ulong)&(flash_addr->data)) {
@@ -324,9 +324,9 @@ static void env_flash_load(void)
                end_addr_new = ltmp;
        }
 
-       if (flash_addr_new->flags != OBSOLETE_FLAG &&
+       if (flash_addr_new->flags != ENV_REDUND_OBSOLETE &&
            crc32(0, flash_addr_new->data, ENV_SIZE) == flash_addr_new->crc) {
-               char flag = OBSOLETE_FLAG;
+               char flag = ENV_REDUND_OBSOLETE;
 
                gd->env_valid = ENV_REDUND;
                flash_sect_protect(0, (ulong)flash_addr_new, end_addr_new);
@@ -336,9 +336,9 @@ static void env_flash_load(void)
                flash_sect_protect(1, (ulong)flash_addr_new, end_addr_new);
        }
 
-       if (flash_addr->flags != ACTIVE_FLAG &&
-           (flash_addr->flags & ACTIVE_FLAG) == ACTIVE_FLAG) {
-               char flag = ACTIVE_FLAG;
+       if (flash_addr->flags != ENV_REDUND_ACTIVE &&
+           (flash_addr->flags & ENV_REDUND_ACTIVE) == ENV_REDUND_ACTIVE) {
+               char flag = ENV_REDUND_ACTIVE;
 
                gd->env_valid = ENV_REDUND;
                flash_sect_protect(0, (ulong)flash_addr, end_addr);
@@ -353,12 +353,13 @@ static void env_flash_load(void)
                     "reading environment; recovered successfully\n\n");
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
-       env_import((char *)flash_addr, 1);
+       return env_import((char *)flash_addr, 1);
 }
 #endif /* LOADENV */
 
 U_BOOT_ENV_LOCATION(flash) = {
        .location       = ENVL_FLASH,
+       ENV_NAME("Flash")
 #ifdef LOADENV
        .load           = env_flash_load,
 #endif