[PATCH] Makefile: Conditionally add defaultenv_h to envtools target

* [PATCH] Makefile: Conditionally add defaultenv_h to envtools target
@ 2021-06-18  2:05 Joel Stanley
  2021-07-15  1:28 ` Tom Rini
  0 siblings, 1 reply; 2+ messages in thread
From: Joel Stanley @ 2021-06-18  2:05 UTC (permalink / raw)
  To: Simon Glass, Bin Meng, Marek Behún, u-boot

When building the envtools target with CONFIG_USE_DEFAULT_ENV_FILE=y,
the tools require generated/defaultenv_autogenerated.h.

 In file included from tools/env/fw_env.c:126:
 include/env_default.h:115:10: fatal error: generated/defaultenv_autogenerated.h: No such file or directory
   115 | #include "generated/defaultenv_autogenerated.h"
       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
This is the minimal patch to fix the issue I was having building under
Yocto, which explicitly builds the envtools target separate to the rest
of u-boot. A similar change is probably required by the 'tools' target.

Alternatively, the tools and envtools could depend on a prepare
target, such as prepare1, which includes all of the prerequisites that
are listed.

 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index a73481d18c14..e096dc999c42 100644
--- a/Makefile
+++ b/Makefile
@@ -1871,6 +1871,8 @@ endif
 
 ifeq ($(CONFIG_USE_DEFAULT_ENV_FILE),y)
 prepare1: $(defaultenv_h)
+
+envtools: $(defaultenv_h)
 endif
 
 archprepare: prepare1 scripts_basic
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread