i.MX6Q: icorem6_rqs: Add modeboot env via board_late_init

[people/ms/u-boot.git] / common / env_sf.c

diff --git a/common/env_sf.c b/common/env_sf.c
index 940983124fbbfd529e7dbd928da8b7f6d94dfab9..27b4d1226a6349c6b95001f4e924aed9db144f61 100644 (file)
--- a/common/env_sf.c
+++ b/common/env_sf.c
@@ -16,18 +16,19 @@
 #include <spi_flash.h>
 #include <search.h>
 #include <errno.h>
+#include <dm/device-internal.h>
 
 #ifndef CONFIG_ENV_SPI_BUS
-# define CONFIG_ENV_SPI_BUS    0
+# define CONFIG_ENV_SPI_BUS    CONFIG_SF_DEFAULT_BUS
 #endif
 #ifndef CONFIG_ENV_SPI_CS
-# define CONFIG_ENV_SPI_CS     0
+# define CONFIG_ENV_SPI_CS     CONFIG_SF_DEFAULT_CS
 #endif
 #ifndef CONFIG_ENV_SPI_MAX_HZ
-# define CONFIG_ENV_SPI_MAX_HZ 1000000
+# define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
 #endif
 #ifndef CONFIG_ENV_SPI_MODE
-# define CONFIG_ENV_SPI_MODE   SPI_MODE_3
+# define CONFIG_ENV_SPI_MODE   CONFIG_SF_DEFAULT_MODE
 #endif
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
@@ -51,6 +52,19 @@ int saveenv(void)
        char    *saved_buffer = NULL, flag = OBSOLETE_FLAG;
        u32     saved_size, saved_offset, sector = 1;
        int     ret;
+#ifdef CONFIG_DM_SPI_FLASH
+       struct udevice *new;
+
+       /* speed and mode will be read from DT */
+       ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
+                                    0, 0, &new);
+       if (ret) {
+               set_default_env("!spi_flash_probe_bus_cs() failed");
+               return 1;
+       }
+
+       env_flash = dev_get_uclass_priv(new);
+#else
 
        if (!env_flash) {
                env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
@@ -61,6 +75,7 @@ int saveenv(void)
                        return 1;
                }
        }
+#endif
 
        ret = env_export(&env_new);
        if (ret)
@@ -210,7 +225,7 @@ void env_relocate_spec(void)
        ret = env_import((char *)ep, 0);
        if (!ret) {
                error("Cannot import environment: errno = %d\n", errno);
-               set_default_env("env_import failed");
+               set_default_env("!env_import failed");
        }
 
 err_read:
@@ -227,6 +242,19 @@ int saveenv(void)
        char    *saved_buffer = NULL;
        int     ret = 1;
        env_t   env_new;
+#ifdef CONFIG_DM_SPI_FLASH
+       struct udevice *new;
+
+       /* speed and mode will be read from DT */
+       ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
+                                    0, 0, &new);
+       if (ret) {
+               set_default_env("!spi_flash_probe_bus_cs() failed");
+               return 1;
+       }
+
+       env_flash = dev_get_uclass_priv(new);
+#else
 
        if (!env_flash) {
                env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
@@ -237,6 +265,7 @@ int saveenv(void)
                        return 1;
                }
        }
+#endif
 
        /* Is the sector larger than the env (i.e. embedded) */
        if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {