vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fw_env: unify calculation of "blockstart" in flash_write_buf()

Browse Source 
In both code paths "blockstart" is calculated the same way. Unify it.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Rafał Miłecki
2026-03-06 10:32:41 -06:00
committed by Tom Rini
parent 2f28f4116a
commit 1d175b2108
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/env/fw_env.c
Vendored
+1 -3
View File
@@ -1007,7 +1007,6 @@ static int flash_write_buf(int dev, int fd, void *buf, size_t count)
if (DEVTYPE(dev) == MTD_ABSENT) {
blocklen = count;
erase_len = blocklen;
blockstart = DEVOFFSET(dev);
block_seek = 0;
write_total = blocklen;
} else {
@@ -1018,8 +1017,6 @@ static int flash_write_buf(int dev, int fd, void *buf, size_t count)
/* Maximum area we may use */
erase_len = environment_end(dev) - erase_offset;
blockstart = erase_offset;
/* Offset inside a block */
block_seek = DEVOFFSET(dev) - erase_offset;
@@ -1085,6 +1082,7 @@ static int flash_write_buf(int dev, int fd, void *buf, size_t count)
erase.length = erasesize;
/* This only runs once on NOR flash and SPI-dataflash */
blockstart = DEVOFFSET(dev);
while (processed < write_total) {
rc = flash_bad_block(fd, DEVTYPE(dev), blockstart);
if (rc < 0) /* block test failed */