mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "saveenv: spi-nor: fix for data abort issue"

Browse source
This commit is contained in:
Linux Build Service Account 2020-08-10 11:06:31 -07:00 • committed by Gerrit - the friendly Code Review server
commit 24d30ab2b2
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
common/env_sf.c
View file

@ -52,14 +52,12 @@ int sf_saveenv(void)
u32 saved_size, saved_offset, sector = 1;
int ret;
env_flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
CONFIG_SF_DEFAULT_CS,
CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE);
if (!env_flash) {
env_flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
CONFIG_SF_DEFAULT_CS,
CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE);
if (!env_flash) {
set_default_env("!spi_flash_probe() failed");
return 1;
}
set_default_env("!spi_flash_probe() failed");
return 1;
}
ret = env_export(&env_new);
@ -226,14 +224,12 @@ int sf_saveenv(void)
int ret = 1;
env_t env_new;
env_flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
CONFIG_SF_DEFAULT_CS,
CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE);
if (!env_flash) {
env_flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
CONFIG_SF_DEFAULT_CS,
CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE);
if (!env_flash) {
set_default_env("!spi_flash_probe() failed");
return 1;
}
set_default_env("!spi_flash_probe() failed");
return 1;
}
/* Is the sector larger than the env (i.e. embedded) */