Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-13 00:17:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

dm: env_sf: fix saveenv() to use driver model

Browse source 
It might be missed when converting spi_flash_probe() in cmd_sf.c.

This patch refers to commit fbb099183e ("dm: Convert
spi_flash_probe() and 'sf probe' to use driver model").

Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Gong Qianyu 2016-01-26 15:06:42 +08:00 committed by York Sun
parent 940d2b89bf
commit 19c31285a3
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
common/env_sf.c
View file

@ -16,6 +16,7 @@
#include <spi_flash.h> #include <spi_flash.h>
#include <search.h> #include <search.h>
#include <errno.h> #include <errno.h>
#include <dm/device-internal.h>
#ifndef CONFIG_ENV_SPI_BUS #ifndef CONFIG_ENV_SPI_BUS
# define CONFIG_ENV_SPI_BUS 0 # define CONFIG_ENV_SPI_BUS 0
@ -51,6 +52,19 @@ int saveenv(void)
char *saved_buffer = NULL, flag = OBSOLETE_FLAG; char *saved_buffer = NULL, flag = OBSOLETE_FLAG;
u32 saved_size, saved_offset, sector = 1; u32 saved_size, saved_offset, sector = 1;
int ret; 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) { if (!env_flash) {
env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
@ -61,6 +75,7 @@ int saveenv(void)
return 1; return 1;
} }
} }
#endif
ret = env_export(&env_new); ret = env_export(&env_new);
if (ret) if (ret)
@ -227,6 +242,19 @@ int saveenv(void)
char *saved_buffer = NULL; char *saved_buffer = NULL;
int ret = 1; int ret = 1;
env_t env_new; 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) { if (!env_flash) {
env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
@ -237,6 +265,7 @@ int saveenv(void)
return 1; return 1;
} }
} }
#endif
/* Is the sector larger than the env (i.e. embedded) */ /* Is the sector larger than the env (i.e. embedded) */
if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) { if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {