diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-27 15:05:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-27 15:05:36 -0500 |
| commit | cd85bec36d0e0d16fedb00e0c434ed070a9c6b37 (patch) | |
| tree | 69f52abae63886f9c50671e1e058c1a26fc7c8bf /common | |
| parent | 19bde0316f2c58b3ab6357832790aee6ed7a4ad5 (diff) | |
| parent | b0f20caf6570fbc4d19c41dcedf9679784042860 (diff) | |
| download | talos-obmc-uboot-cd85bec36d0e0d16fedb00e0c434ed070a9c6b37.tar.gz talos-obmc-uboot-cd85bec36d0e0d16fedb00e0c434ed070a9c6b37.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'common')
| -rw-r--r-- | common/env_sf.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/common/env_sf.c b/common/env_sf.c index 940983124f..892e6cbfb8 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -16,6 +16,7 @@ #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 @@ -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; + + 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) { + 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) @@ -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; + + 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) { + 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) { |
