env: Replace all open-coded gd->env_valid values with ENV_ flags

[u-boot] / env / flash.c

diff --git a/env/flash.c b/env/flash.c
index 004e8849a7dd23508dd790a41e3298f92b167c43..bac10ff98561232e88adeba9f83f70f6e9ce43cb 100644 (file)
--- a/env/flash.c
+++ b/env/flash.c
@@ -20,10 +20,12 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
-#define CMD_SAVEENV
-#elif defined(CONFIG_ENV_ADDR_REDUND)
-#error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
+#ifndef CONFIG_SPL_BUILD
+# if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
+#  define CMD_SAVEENV
+# elif defined(CONFIG_ENV_ADDR_REDUND)
+#  error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
+# endif
 #endif
 
 #if defined(CONFIG_ENV_SIZE_REDUND) && \
@@ -31,34 +33,45 @@ DECLARE_GLOBAL_DATA_PTR;
 #error CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE
 #endif
 
-char *env_name_spec = "Flash";
+/* TODO(sjg@chromium.org): Figure out all these special cases */
+#if (!defined(CONFIG_MICROBLAZE) && !defined(CONFIG_ARCH_ZYNQ) && \
+       !defined(CONFIG_TARGET_MCCMON6) && !defined(CONFIG_TARGET_X600) && \
+       !defined(CONFIG_TARGET_EDMINIV2)) || \
+       !defined(CONFIG_SPL_BUILD)
+#define LOADENV
+#endif
+
+#if !defined(CONFIG_TARGET_X600) || !defined(CONFIG_SPL_BUILD)
+#define INITENV
+#endif
 
 #ifdef ENV_IS_EMBEDDED
 env_t *env_ptr = &environment;
 
-static env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
+static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
 
 #else /* ! ENV_IS_EMBEDDED */
 
 env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
-static env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
+static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
 #endif /* ENV_IS_EMBEDDED */
 
-#if defined(CMD_SAVEENV) || defined(CONFIG_ENV_ADDR_REDUND)
 /* CONFIG_ENV_ADDR is supposed to be on sector boundary */
-static ulong end_addr = CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1;
-#endif
+static ulong __maybe_unused end_addr =
+               CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1;
 
 #ifdef CONFIG_ENV_ADDR_REDUND
-static env_t *flash_addr_new = (env_t *)CONFIG_ENV_ADDR_REDUND;
+
+static env_t __maybe_unused *flash_addr_new = (env_t *)CONFIG_ENV_ADDR_REDUND;
 
 /* CONFIG_ENV_ADDR_REDUND is supposed to be on sector boundary */
-static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
+static ulong __maybe_unused end_addr_new =
+               CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
-
 #ifdef CONFIG_ENV_ADDR_REDUND
-int env_init(void)
+#ifdef INITENV
+static int env_flash_init(void)
 {
        int crc1_ok = 0, crc2_ok = 0;
 
@@ -75,35 +88,36 @@ int env_init(void)
 
        if (crc1_ok && !crc2_ok) {
                gd->env_addr    = addr1;
-               gd->env_valid   = 1;
+               gd->env_valid   = ENV_VALID;
        } else if (!crc1_ok && crc2_ok) {
                gd->env_addr    = addr2;
-               gd->env_valid   = 1;
+               gd->env_valid   = ENV_VALID;
        } else if (!crc1_ok && !crc2_ok) {
                gd->env_addr    = addr_default;
-               gd->env_valid   = 0;
+               gd->env_valid   = ENV_INVALID;
        } else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) {
                gd->env_addr    = addr1;
-               gd->env_valid   = 1;
+               gd->env_valid   = ENV_VALID;
        } else if (flag1 == OBSOLETE_FLAG && flag2 == ACTIVE_FLAG) {
                gd->env_addr    = addr2;
-               gd->env_valid   = 1;
+               gd->env_valid   = ENV_VALID;
        } else if (flag1 == flag2) {
                gd->env_addr    = addr1;
-               gd->env_valid   = 2;
+               gd->env_valid   = ENV_REDUND;
        } else if (flag1 == 0xFF) {
                gd->env_addr    = addr1;
-               gd->env_valid   = 2;
+               gd->env_valid   = ENV_REDUND;
        } else if (flag2 == 0xFF) {
                gd->env_addr    = addr2;
-               gd->env_valid   = 2;
+               gd->env_valid   = ENV_REDUND;
        }
 
        return 0;
 }
+#endif
 
 #ifdef CMD_SAVEENV
-int saveenv(void)
+static int env_flash_save(void)
 {
        env_t   env_new;
        char    *saved_data = NULL;
@@ -207,21 +221,23 @@ done:
 
 #else /* ! CONFIG_ENV_ADDR_REDUND */
 
-int env_init(void)
+#ifdef INITENV
+static int env_flash_init(void)
 {
        if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
                gd->env_addr    = (ulong)&(env_ptr->data);
-               gd->env_valid   = 1;
+               gd->env_valid   = ENV_VALID;
                return 0;
        }
 
        gd->env_addr    = (ulong)&default_environment[0];
-       gd->env_valid   = 0;
+       gd->env_valid   = ENV_INVALID;
        return 0;
 }
+#endif
 
 #ifdef CMD_SAVEENV
-int saveenv(void)
+static int env_flash_save(void)
 {
        env_t   env_new;
        int     rc = 1;
@@ -291,7 +307,8 @@ done:
 
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
-void env_relocate_spec(void)
+#ifdef LOADENV
+static int env_flash_load(void)
 {
 #ifdef CONFIG_ENV_ADDR_REDUND
        if (gd->env_addr != (ulong)&(flash_addr->data)) {
@@ -309,7 +326,7 @@ void env_relocate_spec(void)
            crc32(0, flash_addr_new->data, ENV_SIZE) == flash_addr_new->crc) {
                char flag = OBSOLETE_FLAG;
 
-               gd->env_valid = 2;
+               gd->env_valid = ENV_REDUND;
                flash_sect_protect(0, (ulong)flash_addr_new, end_addr_new);
                flash_write(&flag,
                            (ulong)&(flash_addr_new->flags),
@@ -321,7 +338,7 @@ void env_relocate_spec(void)
            (flash_addr->flags & ACTIVE_FLAG) == ACTIVE_FLAG) {
                char flag = ACTIVE_FLAG;
 
-               gd->env_valid = 2;
+               gd->env_valid = ENV_REDUND;
                flash_sect_protect(0, (ulong)flash_addr, end_addr);
                flash_write(&flag,
                            (ulong)&(flash_addr->flags),
@@ -329,10 +346,27 @@ void env_relocate_spec(void)
                flash_sect_protect(1, (ulong)flash_addr, end_addr);
        }
 
-       if (gd->env_valid == 2)
+       if (gd->env_valid == ENV_REDUND)
                puts("*** Warning - some problems detected "
                     "reading environment; recovered successfully\n\n");
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
        env_import((char *)flash_addr, 1);
+
+       return 0;
 }
+#endif /* LOADENV */
+
+U_BOOT_ENV_LOCATION(flash) = {
+       .location       = ENVL_FLASH,
+       ENV_NAME("Flash")
+#ifdef LOADENV
+       .load           = env_flash_load,
+#endif
+#ifdef CMD_SAVEENV
+       .save           = env_save_ptr(env_flash_save),
+#endif
+#ifdef INITENV
+       .init           = env_flash_init,
+#endif
+};