Convert CONFIG_SYS_MAX_FLASH_SECT to Kconfig

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

diff --git a/env/sf.c b/env/sf.c
index 1c2ab9d..a425ecc 100644 (file)
--- a/env/sf.c
+++ b/env/sf.c
@@ -12,7 +12,6 @@
 #include <dm.h>
 #include <env.h>
 #include <env_internal.h>
-#include <flash.h>
 #include <malloc.h>
 #include <spi.h>
 #include <spi_flash.h>
@@ -24,10 +23,6 @@
 #include <dm/device-internal.h>
 #include <u-boot/crc.h>
 
-#ifndef CONFIG_SPL_BUILD
-#define INITENV
-#endif
-
 #define        OFFSET_INVALID          (~(u32)0)
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
@@ -44,9 +39,7 @@ static ulong env_new_offset   = CONFIG_ENV_OFFSET_REDUND;
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static struct spi_flash *env_flash;
-
-static int setup_flash_device(void)
+static int setup_flash_device(struct spi_flash **env_flash)
 {
 #if CONFIG_IS_ENABLED(DM_SPI_FLASH)
        struct udevice *new;
@@ -54,21 +47,17 @@ static int setup_flash_device(void)
 
        /* speed and mode will be read from DT */
        ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
-                                    CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE,
                                     &new);
        if (ret) {
                env_set_default("spi_flash_probe_bus_cs() failed", 0);
                return ret;
        }
 
-       env_flash = dev_get_uclass_priv(new);
+       *env_flash = dev_get_uclass_priv(new);
 #else
-       if (env_flash)
-               spi_flash_free(env_flash);
-
-       env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
-                                   CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
-       if (!env_flash) {
+       *env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
+                                    CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
+       if (!*env_flash) {
                env_set_default("spi_flash_probe() failed", 0);
                return -EIO;
        }
@@ -84,8 +73,9 @@ static int env_sf_save(void)
        u32     saved_size = 0, saved_offset = 0, sector;
        u32     sect_size = CONFIG_ENV_SECT_SIZE;
        int     ret;
+       struct spi_flash *env_flash;
 
-       ret = setup_flash_device();
+       ret = setup_flash_device(&env_flash);
        if (ret)
                return ret;
 
@@ -154,6 +144,8 @@ static int env_sf_save(void)
        printf("Valid environment: %d\n", (int)gd->env_valid);
 
 done:
+       spi_flash_free(env_flash);
+
        if (saved_buffer)
                free(saved_buffer);
 
@@ -165,6 +157,7 @@ static int env_sf_load(void)
        int ret;
        int read1_fail, read2_fail;
        env_t *tmp_env1, *tmp_env2;
+       struct spi_flash *env_flash;
 
        tmp_env1 = (env_t *)memalign(ARCH_DMA_MINALIGN,
                        CONFIG_ENV_SIZE);
@@ -176,7 +169,7 @@ static int env_sf_load(void)
                goto out;
        }
 
-       ret = setup_flash_device();
+       ret = setup_flash_device(&env_flash);
        if (ret)
                goto out;
 
@@ -189,7 +182,6 @@ static int env_sf_load(void)
                                read2_fail, H_EXTERNAL);
 
        spi_flash_free(env_flash);
-       env_flash = NULL;
 out:
        free(tmp_env1);
        free(tmp_env2);
@@ -204,8 +196,9 @@ static int env_sf_save(void)
        char    *saved_buffer = NULL;
        int     ret = 1;
        env_t   env_new;
+       struct spi_flash *env_flash;
 
-       ret = setup_flash_device();
+       ret = setup_flash_device(&env_flash);
        if (ret)
                return ret;
 
@@ -255,6 +248,8 @@ static int env_sf_save(void)
        puts("done\n");
 
 done:
+       spi_flash_free(env_flash);
+
        if (saved_buffer)
                free(saved_buffer);
 
@@ -265,6 +260,7 @@ static int env_sf_load(void)
 {
        int ret;
        char *buf = NULL;
+       struct spi_flash *env_flash;
 
        buf = (char *)memalign(ARCH_DMA_MINALIGN, CONFIG_ENV_SIZE);
        if (!buf) {
@@ -272,7 +268,7 @@ static int env_sf_load(void)
                return -EIO;
        }
 
-       ret = setup_flash_device();
+       ret = setup_flash_device(&env_flash);
        if (ret)
                goto out;
 
@@ -289,7 +285,6 @@ static int env_sf_load(void)
 
 err_read:
        spi_flash_free(env_flash);
-       env_flash = NULL;
 out:
        free(buf);
 
@@ -301,8 +296,9 @@ static int env_sf_erase(void)
 {
        int ret;
        env_t env;
+       struct spi_flash *env_flash;
 
-       ret = setup_flash_device();
+       ret = setup_flash_device(&env_flash);
        if (ret)
                return ret;
 
@@ -316,19 +312,19 @@ static int env_sf_erase(void)
 
 done:
        spi_flash_free(env_flash);
-       env_flash = NULL;
 
        return ret;
 }
 
-#if CONFIG_ENV_ADDR != 0x0
 __weak void *env_sf_get_env_addr(void)
 {
+#ifndef CONFIG_SPL_BUILD
        return (void *)CONFIG_ENV_ADDR;
-}
+#else
+       return NULL;
 #endif
+}
 
-#if defined(INITENV) && (CONFIG_ENV_ADDR != 0x0)
 /*
  * check if Environment on CONFIG_ENV_ADDR is valid.
  */
@@ -336,17 +332,18 @@ static int env_sf_init_addr(void)
 {
        env_t *env_ptr = (env_t *)env_sf_get_env_addr();
 
+       if (!env_ptr)
+               return -ENOENT;
+
        if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
-               gd->env_addr    = (ulong)&(env_ptr->data);
-               gd->env_valid   = 1;
+               gd->env_addr = (ulong)&(env_ptr->data);
+               gd->env_valid = ENV_VALID;
        } else {
-               gd->env_addr = (ulong)&default_environment[0];
-               gd->env_valid = 1;
+               gd->env_valid = ENV_INVALID;
        }
 
        return 0;
 }
-#endif
 
 #if defined(CONFIG_ENV_SPI_EARLY)
 /*
@@ -361,6 +358,7 @@ static int env_sf_init_early(void)
        int crc1_ok;
        env_t *tmp_env2 = NULL;
        env_t *tmp_env1;
+       struct spi_flash *env_flash;
 
        /*
         * if malloc is not ready yet, we cannot use
@@ -378,7 +376,7 @@ static int env_sf_init_early(void)
        if (!tmp_env1 || !tmp_env2)
                goto out;
 
-       ret = setup_flash_device();
+       ret = setup_flash_device(&env_flash);
        if (ret)
                goto out;
 
@@ -413,10 +411,12 @@ static int env_sf_init_early(void)
                gd->env_addr = (unsigned long)&tmp_env1->data;
        }
 
+       spi_flash_free(env_flash);
+
        return 0;
 err_read:
        spi_flash_free(env_flash);
-       env_flash = NULL;
+
        free(tmp_env1);
        if (IS_ENABLED(CONFIG_SYS_REDUNDAND_ENVIRONMENT))
                free(tmp_env2);
@@ -429,9 +429,10 @@ out:
 
 static int env_sf_init(void)
 {
-#if defined(INITENV) && (CONFIG_ENV_ADDR != 0x0)
-       return env_sf_init_addr();
-#elif defined(CONFIG_ENV_SPI_EARLY)
+       int ret = env_sf_init_addr();
+       if (ret != -ENOENT)
+               return ret;
+#ifdef CONFIG_ENV_SPI_EARLY
        return env_sf_init_early();
 #endif
        /*