MLK-22279-1 env: Add env_get_offset to override static env offset

Add env_get_offset interface to override static CONFIG_ENV_OFFSET,
and update env location driver to use env_get_offset. So for different
storage medium, we are able to store the env at different offset.

We don't support this feature when CONFIG_ENV_IS_EMBEDDED is set.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5b12d7cabb14bab9a95af7460b36c6c85db1b328)

diff --git a/env/eeprom.c b/env/eeprom.c
index ac2689c..43687ae 100644 (file)
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -66,7 +66,7 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset,
 int env_eeprom_get_char(int index)
 {
        uchar c;
-       unsigned int off = CONFIG_ENV_OFFSET;
+       unsigned int off = env_get_offset(CONFIG_ENV_OFFSET);
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
        if (gd->env_valid == ENV_REDUND)
@@ -81,7 +81,7 @@ int env_eeprom_get_char(int index)
 static int env_eeprom_load(void)
 {
        char buf_env[CONFIG_ENV_SIZE];
-       unsigned int off = CONFIG_ENV_OFFSET;
+       unsigned int off = env_get_offset(CONFIG_ENV_OFFSET);
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
        ulong len, crc[2], crc_tmp;
@@ -91,7 +91,7 @@ static int env_eeprom_load(void)
 
        eeprom_init(-1);        /* prepare for EEPROM read/write */
 
-       off_env[0] = CONFIG_ENV_OFFSET;
+       off_env[0] = env_get_offset(CONFIG_ENV_OFFSET);
        off_env[1] = CONFIG_ENV_OFFSET_REDUND;
 
        for (i = 0; i < 2; i++) {
@@ -151,7 +151,7 @@ static int env_eeprom_load(void)
 
        /* read old CRC */
        eeprom_bus_read(CONFIG_SYS_DEF_EEPROM_ADDR,
-                       CONFIG_ENV_OFFSET + offsetof(env_t, crc),
+                       env_get_offset(CONFIG_ENV_OFFSET) + offsetof(env_t, crc),
                        (uchar *)&crc, sizeof(ulong));
 
        new = 0;
@@ -161,7 +161,7 @@ static int env_eeprom_load(void)
                int n = (len > sizeof(rdbuf)) ? sizeof(rdbuf) : len;
 
                eeprom_bus_read(CONFIG_SYS_DEF_EEPROM_ADDR,
-                               CONFIG_ENV_OFFSET + off, rdbuf, n);
+                               env_get_offset(CONFIG_ENV_OFFSET) + off, rdbuf, n);
                new = crc32(new, rdbuf, n);
                len -= n;
                off += n;
@@ -174,7 +174,7 @@ static int env_eeprom_load(void)
        }
 #endif /* CONFIG_ENV_OFFSET_REDUND */
 
-       off = CONFIG_ENV_OFFSET;
+       off = env_get_offset(CONFIG_ENV_OFFSET);
 #ifdef CONFIG_ENV_OFFSET_REDUND
        if (gd->env_valid == ENV_REDUND)
                off = CONFIG_ENV_OFFSET_REDUND;
@@ -190,7 +190,7 @@ static int env_eeprom_save(void)
 {
        env_t   env_new;
        int     rc;
-       unsigned int off        = CONFIG_ENV_OFFSET;
+       unsigned int off        = env_get_offset(CONFIG_ENV_OFFSET);
 #ifdef CONFIG_ENV_OFFSET_REDUND
        unsigned int off_red    = CONFIG_ENV_OFFSET_REDUND;
        char flag_obsolete      = OBSOLETE_FLAG;
@@ -203,7 +203,7 @@ static int env_eeprom_save(void)
 #ifdef CONFIG_ENV_OFFSET_REDUND
        if (gd->env_valid == ENV_VALID) {
                off     = CONFIG_ENV_OFFSET_REDUND;
-               off_red = CONFIG_ENV_OFFSET;
+               off_red = env_get_offset(CONFIG_ENV_OFFSET);
        }
 
        env_new.flags = ACTIVE_FLAG;

diff --git a/env/env.c b/env/env.c
index 4b417b9..c47ca99 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -280,3 +280,10 @@ int env_init(void)
 
        return ret;
 }
+
+#ifndef ENV_IS_EMBEDDED
+__weak long long env_get_offset(long long defautl_offset)
+{
+       return defautl_offset;
+}
+#endif

diff --git a/env/mmc.c b/env/mmc.c
index c3cf35d..8d16cea 100644 (file)
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -86,7 +86,7 @@ static inline s64 mmc_offset(int copy)
                        return val;
        }
 
-       defvalue = CONFIG_ENV_OFFSET;
+       defvalue = env_get_offset(CONFIG_ENV_OFFSET);
        propname = dt_prop.offset;
 
 #if defined(CONFIG_ENV_OFFSET_REDUND)
@@ -100,7 +100,7 @@ static inline s64 mmc_offset(int copy)
 #else
 static inline s64 mmc_offset(int copy)
 {
-       s64 offset = CONFIG_ENV_OFFSET;
+       s64 offset = env_get_offset(CONFIG_ENV_OFFSET);
 
 #if defined(CONFIG_ENV_OFFSET_REDUND)
        if (copy)

diff --git a/env/nand.c b/env/nand.c
index 29eda66..5b444c3 100644 (file)
--- a/env/nand.c
+++ b/env/nand.c
@@ -190,7 +190,7 @@ static int env_nand_save(void)
                        .name = "NAND",
                        .erase_opts = {
                                .length = CONFIG_ENV_RANGE,
-                               .offset = CONFIG_ENV_OFFSET,
+                               .offset = env_get_offset(CONFIG_ENV_OFFSET),
                        },
                },
 #ifdef CONFIG_ENV_OFFSET_REDUND
@@ -330,7 +330,7 @@ static int env_nand_load(void)
                goto done;
        }
 
-       read1_fail = readenv(CONFIG_ENV_OFFSET, (u_char *) tmp_env1);
+       read1_fail = readenv(env_get_offset(CONFIG_ENV_OFFSET), (u_char *) tmp_env1);
        read2_fail = readenv(CONFIG_ENV_OFFSET_REDUND, (u_char *) tmp_env2);
 
        ret = env_import_redund((char *)tmp_env1, read1_fail, (char *)tmp_env2,
@@ -369,7 +369,7 @@ static int env_nand_load(void)
        }
 #endif
 
-       ret = readenv(CONFIG_ENV_OFFSET, (u_char *)buf);
+       ret = readenv(env_get_offset(CONFIG_ENV_OFFSET), (u_char *)buf);
        if (ret) {
                set_default_env("readenv() failed", 0);
                return -EIO;

diff --git a/env/sata.c b/env/sata.c
index 1f9669d..556ded5 100644 (file)
--- a/env/sata.c
+++ b/env/sata.c
@@ -65,7 +65,7 @@ static int env_sata_save(void)
                return 1;
 
        printf("Writing to SATA(%d)...", env_sata);
-       if (write_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, (u_char *)env_new)) {
+       if (write_env(sata, CONFIG_ENV_SIZE, env_get_offset(CONFIG_ENV_OFFSET), (u_char *)env_new)) {
                puts("failed\n");
                return 1;
        }
@@ -105,7 +105,7 @@ static int env_sata_load(void)
                return -EIO;
        }
 
-       if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) {
+       if (read_env(sata, CONFIG_ENV_SIZE, env_get_offset(CONFIG_ENV_OFFSET), buf)) {
                set_default_env(NULL, 0);
                return -EIO;
        }

diff --git a/env/sf.c b/env/sf.c
index 4f92ae0..d3048f2 100644 (file)
--- a/env/sf.c
+++ b/env/sf.c
@@ -88,9 +88,9 @@ static int env_sf_save(void)
 
        if (gd->env_valid == ENV_VALID) {
                env_new_offset = CONFIG_ENV_OFFSET_REDUND;
-               env_offset = CONFIG_ENV_OFFSET;
+               env_offset = env_get_offset(CONFIG_ENV_OFFSET);
        } else {
-               env_new_offset = CONFIG_ENV_OFFSET;
+               env_new_offset = env_get_offset(CONFIG_ENV_OFFSET);
                env_offset = CONFIG_ENV_OFFSET_REDUND;
        }
 
@@ -170,7 +170,7 @@ static int env_sf_load(void)
        if (ret)
                goto out;
 
-       read1_fail = spi_flash_read(env_flash, CONFIG_ENV_OFFSET,
+       read1_fail = spi_flash_read(env_flash, env_get_offset(CONFIG_ENV_OFFSET),
                                    CONFIG_ENV_SIZE, tmp_env1);
        read2_fail = spi_flash_read(env_flash, CONFIG_ENV_OFFSET_REDUND,
                                    CONFIG_ENV_SIZE, tmp_env2);
@@ -202,7 +202,7 @@ static int env_sf_save(void)
        /* Is the sector larger than the env (i.e. embedded) */
        if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
                saved_size = CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SIZE;
-               saved_offset = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE;
+               saved_offset = env_get_offset(CONFIG_ENV_OFFSET) + CONFIG_ENV_SIZE;
                saved_buffer = malloc(saved_size);
                if (!saved_buffer)
                        goto done;
@@ -220,13 +220,13 @@ static int env_sf_save(void)
        sector = DIV_ROUND_UP(CONFIG_ENV_SIZE, CONFIG_ENV_SECT_SIZE);
 
        puts("Erasing SPI flash...");
-       ret = spi_flash_erase(env_flash, CONFIG_ENV_OFFSET,
+       ret = spi_flash_erase(env_flash, env_get_offset(CONFIG_ENV_OFFSET),
                sector * CONFIG_ENV_SECT_SIZE);
        if (ret)
                goto done;
 
        puts("Writing to SPI flash...");
-       ret = spi_flash_write(env_flash, CONFIG_ENV_OFFSET,
+       ret = spi_flash_write(env_flash, env_get_offset(CONFIG_ENV_OFFSET),
                CONFIG_ENV_SIZE, &env_new);
        if (ret)
                goto done;
@@ -265,7 +265,7 @@ static int env_sf_load(void)
                goto out;
 
        ret = spi_flash_read(env_flash,
-               CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, buf);
+               env_get_offset(CONFIG_ENV_OFFSET), CONFIG_ENV_SIZE, buf);
        if (ret) {
                set_default_env("spi_flash_read() failed", 0);
                goto err_read;

diff --git a/include/environment.h b/include/environment.h
index c9ff7d4..856f581 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -280,6 +280,12 @@ int env_import_redund(const char *buf1, int buf1_status,
                      const char *buf2, int buf2_status);
 #endif
 
+#ifdef ENV_IS_EMBEDDED
+#define env_get_offset(x) x
+#else
+long long env_get_offset(long long defautl_offset);
+#endif
+
 /**
  * env_get_char() - Get a character from the early environment
  *