env: Fix out of tree building of tools-all

With the move of environment code from common/ to env/ a number of
changes needed to be made to various make targets.  We missed updating
some of the files required for out of tree builds of the tools.  Correct
the 'environ' target to know that we need to work under tools/env/ still
(not tools/environ/) and then update the wrappers in env_attr.c and
env_flags.c to point to the new correct file.

Reported-by: Peter Robinson <pbrobinson@gmail.com>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2017-09-05 14:01:29 -04:00
parent 8dcb6f1f81
commit 2d3229bea2
4 changed files with 4 additions and 4 deletions

View file

@ -1466,7 +1466,7 @@ checkarmreloc: u-boot
fi
environ: scripts_basic
$(Q)$(MAKE) $(build)=tools/$@
$(Q)$(MAKE) $(build)=tools/env
tools-only: scripts_basic $(version_h) $(timestamp_h)
$(Q)$(MAKE) $(build)=tools

View file

@ -1 +1 @@
#include "../../common/env_attr.c"
#include "../../env/attr.c"

View file

@ -1 +1 @@
#include "../../common/env_flags.c"
#include "../../env/flags.c"

2
tools/env/fw_env.c vendored
View file

@ -755,7 +755,7 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count,
/*
* If a block is bad, we retry in the next block at the same
* offset - see common/env_nand.c::writeenv()
* offset - see env/nand.c::writeenv()
*/
lseek (fd, blockstart + block_seek, SEEK_SET);