mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
env_sf: use DIV_ROUND_UP to calculate number of sectors to erase
simpler to read Signed-off-by: Andreas Fenkart <afenkart@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@openedev.com>
This commit is contained in:
parent
c041c60c6c
commit
0b2e5bbe6a
1 changed files with 5 additions and 13 deletions
|
@ -80,7 +80,7 @@ int saveenv(void)
|
|||
{
|
||||
env_t env_new;
|
||||
char *saved_buffer = NULL, flag = OBSOLETE_FLAG;
|
||||
u32 saved_size, saved_offset, sector = 1;
|
||||
u32 saved_size, saved_offset, sector;
|
||||
int ret;
|
||||
|
||||
ret = setup_flash_device();
|
||||
|
@ -115,11 +115,7 @@ int saveenv(void)
|
|||
goto done;
|
||||
}
|
||||
|
||||
if (CONFIG_ENV_SIZE > CONFIG_ENV_SECT_SIZE) {
|
||||
sector = CONFIG_ENV_SIZE / CONFIG_ENV_SECT_SIZE;
|
||||
if (CONFIG_ENV_SIZE % CONFIG_ENV_SECT_SIZE)
|
||||
sector++;
|
||||
}
|
||||
sector = DIV_ROUND_UP(CONFIG_ENV_SIZE, CONFIG_ENV_SECT_SIZE);
|
||||
|
||||
puts("Erasing SPI flash...");
|
||||
ret = spi_flash_erase(env_flash, env_new_offset,
|
||||
|
@ -245,7 +241,7 @@ out:
|
|||
#else
|
||||
int saveenv(void)
|
||||
{
|
||||
u32 saved_size, saved_offset, sector = 1;
|
||||
u32 saved_size, saved_offset, sector;
|
||||
char *saved_buffer = NULL;
|
||||
int ret = 1;
|
||||
env_t env_new;
|
||||
|
@ -268,16 +264,12 @@ int saveenv(void)
|
|||
goto done;
|
||||
}
|
||||
|
||||
if (CONFIG_ENV_SIZE > CONFIG_ENV_SECT_SIZE) {
|
||||
sector = CONFIG_ENV_SIZE / CONFIG_ENV_SECT_SIZE;
|
||||
if (CONFIG_ENV_SIZE % CONFIG_ENV_SECT_SIZE)
|
||||
sector++;
|
||||
}
|
||||
|
||||
ret = env_export(&env_new);
|
||||
if (ret)
|
||||
goto done;
|
||||
|
||||
sector = DIV_ROUND_UP(CONFIG_ENV_SIZE, CONFIG_ENV_SECT_SIZE);
|
||||
|
||||
puts("Erasing SPI flash...");
|
||||
ret = spi_flash_erase(env_flash, CONFIG_ENV_OFFSET,
|
||||
sector * CONFIG_ENV_SECT_SIZE);
|
||||
|
|
Loading…
Add table
Reference in a new issue