| Message ID | 1566817578-16750-3-git-send-email-pjtexier@koncepto.io |
|---|---|
| State | Accepted |
| Commit | 7ce01c78dcd34b49c779467c33953c931bf7bf06 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | env: fix build error for envtools | expand |
On Mon, Aug 26, 2019 at 6:08 AM Pierre-Jean Texier <pjtexier@koncepto.io> wrote: > > The following error appears: > > tools/env/fw_env.c:1149:25: error: lvalue required as unary ‘&’ operand > rc = write(fd, &ENV_REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE)); > > Fixes: d3716dd ("env: Rename the redundancy flags") > > Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> > Tested-by: Joris Offouga <offougajoris@gmail.com> > Tested-by: Heiko Schocher <hs@denx.de> > Suggested-by: Heiko Schocher <hs@denx.de> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
On Mon, Aug 26, 2019 at 01:06:16PM +0200, Pierre-Jean Texier wrote: > The following error appears: > > tools/env/fw_env.c:1149:25: error: lvalue required as unary ‘&’ operand > rc = write(fd, &ENV_REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE)); > > Fixes: d3716dd ("env: Rename the redundancy flags") > > Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> > Tested-by: Joris Offouga <offougajoris@gmail.com> > Tested-by: Heiko Schocher <hs@denx.de> > Suggested-by: Heiko Schocher <hs@denx.de> > Acked-by: Joe Hershberger <joe.hershberger@ni.com> Applied to u-boot/master, thanks!
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 876bf2b..e2801f5 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1135,6 +1135,7 @@ static int flash_flag_obsolete(int dev, int fd, off_t offset) { int rc; struct erase_info_user erase; + char tmp = ENV_REDUND_OBSOLETE; erase.start = DEVOFFSET(dev); erase.length = DEVESIZE(dev); @@ -1146,7 +1147,7 @@ static int flash_flag_obsolete(int dev, int fd, off_t offset) return rc; } ioctl(fd, MEMUNLOCK, &erase); - rc = write(fd, &ENV_REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE)); + rc = write(fd, &tmp, sizeof(tmp)); ioctl(fd, MEMLOCK, &erase); if (rc < 0) perror("Could not set obsolete flag");
The following error appears: tools/env/fw_env.c:1149:25: error: lvalue required as unary ‘&’ operand rc = write(fd, &ENV_REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE)); Fixes: d3716dd ("env: Rename the redundancy flags") Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> Tested-by: Joris Offouga <offougajoris@gmail.com> Tested-by: Heiko Schocher <hs@denx.de> Suggested-by: Heiko Schocher <hs@denx.de> --- v1 -> v2: - fix fw_setenv with flag_obsolete (reported by Heiko Schocher) tools/env/fw_env.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)