diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2016-07-14 00:14:38 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-07-22 18:46:20 (GMT) |
commit | f4742ca0fb94e531b8dcddd1ac0799ee4c9c2605 (patch) | |
tree | e908058bcd6eaf2a9bfe05146cc0567153fa8125 /tools/env/fw_env.c | |
parent | 14fb5b252ac21c81e24fa734c3f66e9d6c3a0932 (diff) | |
download | u-boot-f4742ca0fb94e531b8dcddd1ac0799ee4c9c2605.tar.xz |
tools/env: allow negative offsets
A negative value for the offset is treated as a backwards offset for
from the end of the device/partition for block devices. This aligns
the behavior of the config file with the syntax of CONFIG_ENV_OFFSET
where the functionality has been introduced with
commit 5c088ee841f9 ("env_mmc: allow negative CONFIG_ENV_OFFSET").
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'tools/env/fw_env.c')
-rw-r--r-- | tools/env/fw_env.c | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 06d6865..be338a5b 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -14,6 +14,7 @@ #include <errno.h> #include <env_flags.h> #include <fcntl.h> +#include <linux/fs.h> #include <linux/stringify.h> #include <ctype.h> #include <stdio.h> @@ -51,7 +52,7 @@ struct env_opts default_opts = { struct envdev_s { const char *devname; /* Device name */ - ulong devoff; /* Device offset */ + long long devoff; /* Device offset */ ulong env_size; /* environment size */ ulong erase_size; /* device erase size */ ulong env_sectors; /* number of environment sectors */ @@ -994,7 +995,7 @@ static int flash_write (int fd_current, int fd_target, int dev_target) } #ifdef DEBUG - fprintf(stderr, "Writing new environment at 0x%lx on %s\n", + fprintf(stderr, "Writing new environment at 0x%llx on %s\n", DEVOFFSET (dev_target), DEVNAME (dev_target)); #endif @@ -1010,7 +1011,7 @@ static int flash_write (int fd_current, int fd_target, int dev_target) offsetof (struct env_image_redundant, flags); #ifdef DEBUG fprintf(stderr, - "Setting obsolete flag in environment at 0x%lx on %s\n", + "Setting obsolete flag in environment at 0x%llx on %s\n", DEVOFFSET (dev_current), DEVNAME (dev_current)); #endif flash_flag_obsolete (dev_current, fd_current, offset); @@ -1335,7 +1336,27 @@ static int check_device_config(int dev) } DEVTYPE(dev) = mtdinfo.type; } else { + uint64_t size; DEVTYPE(dev) = MTD_ABSENT; + + /* + * Check for negative offsets, treat it as backwards offset + * from the end of the block device + */ + if (DEVOFFSET(dev) < 0) { + rc = ioctl(fd, BLKGETSIZE64, &size); + if (rc < 0) { + fprintf(stderr, "Could not get block device size on %s\n", + DEVNAME(dev)); + goto err; + } + + DEVOFFSET(dev) = DEVOFFSET(dev) + size; +#ifdef DEBUG + fprintf(stderr, "Calculated device offset 0x%llx on %s\n", + DEVOFFSET(dev), DEVNAME(dev)); +#endif + } } err: @@ -1434,12 +1455,12 @@ static int get_config (char *fname) if (dump[0] == '#') continue; - rc = sscanf (dump, "%ms %lx %lx %lx %lx", - &devname, - &DEVOFFSET (i), - &ENVSIZE (i), - &DEVESIZE (i), - &ENVSECTORS (i)); + rc = sscanf(dump, "%ms %lli %lx %lx %lx", + &devname, + &DEVOFFSET(i), + &ENVSIZE(i), + &DEVESIZE(i), + &ENVSECTORS(i)); if (rc < 3) continue; |