From 573329571435eae967182baf94b2146188fb1ee5 Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Tue, 5 Sep 2017 01:53:58 -0600 Subject: [PATCH] env: Fix operation of 'make environ' MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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> --- Makefile | 4 ++-- tools/env/README | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 020ebd50ad..70971b1101 100644 --- a/Makefile +++ b/Makefile @@ -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 ; 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" -- 2.39.5