env: Fix out of tree building of tools-all
PATCH 1/1 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.
--- Makefile | 2 +- tools/env/env_attr.c | 2 +- tools/env/env_flags.c | 2 +- tools/env/fw_env.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
Makefile +1 -1
@@ -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
tools/env/env_attr.c +1 -1
@@ -1 +1 @@ -#include "../../common/env_attr.c" +#include "../../env/attr.c"
tools/env/env_flags.c +1 -1
@@ -1 +1 @@ -#include "../../common/env_flags.c" +#include "../../env/flags.c"
tools/env/fw_env.c +1 -1
@@ -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 );
Signature · 1 line
1.9.1
PATCH 1/1 env: Fix out of tree building of tools-all
Quoted 9 lines · Tom Rini
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 (nottools/environ/) and then update the wrappers inenv_attr.candenv_flags.cto point to the new correct file.Reported-by Peter Robinson <[email protected]>Signed-off-by Tom Rini <[email protected]>
Works for my use case, thanks for the quick fix.
Regards,
Peter
Quoted 50 lines
--- Makefile | 2 +- tools/env/env_attr.c | 2 +- tools/env/env_flags.c | 2 +- tools/env/fw_env.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)Makefile +1
-1@@ -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)=toolstools/env/env_attr.c +1
-1@@ -1 +1 @@ -#include "../../common/env_attr.c" +#include "../../env/attr.c" tools/env/env_flags.c +1
-1@@ -1 +1 @@ -#include "../../common/env_flags.c" +#include "../../env/flags.c" tools/env/fw_env.c +1
-2@@ -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 ); --1.9.1
PATCH 1/1 env: Fix out of tree building of tools-all
In reply to Tom RiniQuoted 10 lines · Tom Rini
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 (nottools/environ/) and then update the wrappers inenv_attr.candenv_flags.cto point to the new correct file.Reported-by Peter Robinson <[email protected]>Tested-by Peter Robinson <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170905/4290ad35/attachment.sig>