This was broken by the recent environment refactoring. Specifically: $ make environ scripts/Makefile.build:59: tools/environ/Makefile: No such file or directory make[1]: *** No rule to make target 'tools/environ/Makefile'. Stop. make: *** [Makefile:1469: environ] Error 2
Fix this by updating the Makefile and adjusting the #include filesnames in two C files. Fixes: ec74f5f (Makefile: Rename 'env' target to 'environ') Reported-by: Måns Rullgård <[email protected]> Signed-off-by: Simon Glass <[email protected]> --- Changes in v2: - Use 'envtools' target - Update tools/env/Makefile to mention the new target Makefile | 4 ++-- tools/env/README | 4 ++-- tools/env/env_attr.c | 2 +- tools/env/env_flags.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7921625211..b19e3bd388 100644 --- a/Makefile +++ b/Makefile @@ -1465,8 +1465,8 @@ checkarmreloc: u-boot false; \ fi -environ: scripts_basic - $(Q)$(MAKE) $(build)=tools/$@ +envtools: scripts_basic + $(Q)$(MAKE) $(build)=tools/env tools-only: scripts_basic $(version_h) $(timestamp_h) $(Q)$(MAKE) $(build)=tools diff --git a/tools/env/README b/tools/env/README index 24e31bc9f8..bc6e2c11ef 100644 --- a/tools/env/README +++ b/tools/env/README @@ -3,9 +3,9 @@ This is a demo implementation of a Linux command line tool to access the U-Boot's environment variables. In order to cross-compile fw_printenv, run - make CROSS_COMPILE=<your cross-compiler prefix> env + make CROSS_COMPILE=<your cross-compiler prefix> envtools in the root directory of the U-Boot distribution. For example, - make CROSS_COMPILE=arm-linux- env + make CROSS_COMPILE=arm-linux- envtools For the run-time utility configuration uncomment the line #define CONFIG_FILE "/etc/fw_env.config" diff --git a/tools/env/env_attr.c b/tools/env/env_attr.c index 502d4c900b..4d8536335c 100644 --- a/tools/env/env_attr.c +++ b/tools/env/env_attr.c @@ -1 +1 @@ -#include "../../common/env_attr.c" +#include "../../env/attr.c" diff --git a/tools/env/env_flags.c b/tools/env/env_flags.c index b261cb8e39..71e13e2021 100644 --- a/tools/env/env_flags.c +++ b/tools/env/env_flags.c @@ -1 +1 @@ -#include "../../common/env_flags.c" +#include "../../env/flags.c" -- 2.14.1.581.gf28d330327-goog _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
