env: Fix operation of 'make environ'

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 <mans@mansr.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-09-05 01:53:58 -06:00 committed by Tom Rini
parent de4e4edaff
commit 5733295714
2 changed files with 4 additions and 4 deletions

View File

@ -1465,14 +1465,14 @@ checkarmreloc: u-boot
false; \
fi
environ: scripts_basic
envtools: scripts_basic
$(Q)$(MAKE) $(build)=tools/env
tools-only: scripts_basic $(version_h) $(timestamp_h)
$(Q)$(MAKE) $(build)=tools
tools-all: export HOST_TOOLS_ALL=y
tools-all: environ tools ;
tools-all: envtools tools ;
cross_tools: export CROSS_BUILD_TOOLS=y
cross_tools: tools ;

4
tools/env/README vendored
View File

@ -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"