GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-22 15:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Suspected Spam: Do not open attachements![PATCH 4/6] tools/env: flash_write_buf: enforce offset to be start of environment

Browse source 
This allows to take advantage of the environment being block aligned.
This is not a new constraint. Writes always start at the begin of the
environment, since the header with CRC/length as there.
Every environment modification requires updating the header

Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
This commit is contained in:
Andreas Fenkart 2016-08-29 23:17:00 +02:00 • committed by Tom Rini
parent ff95e579cf
commit 24307d6337
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/env/fw_env.c vendored
View file

@ -765,12 +765,12 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count,
} }
/* /*
* Write count bytes at offset, but stay within ENVSECTORS (dev) sectors of * Write count bytes from begin of environment, but stay within
* ENVSECTORS(dev) sectors of
* DEVOFFSET (dev). Similar to the read case above, on NOR and dataflash we * DEVOFFSET (dev). Similar to the read case above, on NOR and dataflash we
* erase and write the whole data at once. * erase and write the whole data at once.
*/ */
static int flash_write_buf (int dev, int fd, void *buf, size_t count, static int flash_write_buf(int dev, int fd, void *buf, size_t count)
off_t offset)
{ {
void *data; void *data;
struct erase_info_user erase; struct erase_info_user erase;
@ -796,20 +796,21 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count,
if (DEVTYPE(dev) == MTD_ABSENT) { if (DEVTYPE(dev) == MTD_ABSENT) {
blocklen = count; blocklen = count;
erase_len = blocklen; erase_len = blocklen;
blockstart = offset; blockstart = DEVOFFSET(dev);
block_seek = 0; block_seek = 0;
write_total = blocklen; write_total = blocklen;
} else { } else {
blocklen = DEVESIZE(dev); blocklen = DEVESIZE(dev);
erase_offset = (offset / blocklen) * blocklen; erase_offset = DEVOFFSET(dev);
/* Maximum area we may use */ /* Maximum area we may use */
erase_len = environment_end(dev) - erase_offset; erase_len = environment_end(dev) - erase_offset;
blockstart = erase_offset; blockstart = erase_offset;
/* Offset inside a block */ /* Offset inside a block */
block_seek = offset - erase_offset; block_seek = DEVOFFSET(dev) - erase_offset;
/* /*
* Data size we actually write: from the start of the block * Data size we actually write: from the start of the block
@ -1007,7 +1008,7 @@ static int flash_write (int fd_current, int fd_target, int dev_target)
#endif #endif
rc = flash_write_buf(dev_target, fd_target, environment.image, rc = flash_write_buf(dev_target, fd_target, environment.image,
CUR_ENVSIZE, DEVOFFSET(dev_target)); CUR_ENVSIZE);
if (rc < 0) if (rc < 0)
return rc; return rc;