[U-Boot] [PATCH v5 01/30] Makefile: Rename 'env' target to 'environ'

Måns Rullgård mans at mansr.com
Fri Aug 18 14:31:09 UTC 2017


Simon Glass <sjg at chromium.org> writes:

> This target stops us using 'env' as a subdirectory. It is not mentioned in
> the help so seems to be an internal target. Rename it.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> Reviewed-by: Tom Rini <trini at konsulko.com>
> ---
>
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
>
>  Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 50a002e72f..04a22a6818 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1463,14 +1463,14 @@ checkarmreloc: u-boot
>  		false; \
>  	fi
>
> -env: scripts_basic
> +environ: scripts_basic
>  	$(Q)$(MAKE) $(build)=tools/$@

This broke things:

$ 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

The 'env' target was used to build the fw_{print,set}env tools in the
tools/env directory.  The make rule relies on the target having the same
name as the subdirectory.

>  tools-only: scripts_basic $(version_h) $(timestamp_h)
>  	$(Q)$(MAKE) $(build)=tools
>
>  tools-all: export HOST_TOOLS_ALL=y
> -tools-all: env tools ;
> +tools-all: environ tools ;
>
>  cross_tools: export CROSS_BUILD_TOOLS=y
>  cross_tools: tools ;
> -- 
> 2.14.0.rc1.383.gd1ce394fe2-goog
>

-- 
Måns Rullgård


More information about the U-Boot mailing list