diff mbox series

Makefile: Conditionally add defaultenv_h to envtools target

Message ID 20210618020559.891395-1-joel@jms.id.au
State Accepted
Commit 2a2896b17fa47168b87590a1e9b42765c598e3c7
Headers show
Series Makefile: Conditionally add defaultenv_h to envtools target | expand

Commit Message

Joel Stanley June 18, 2021, 2:05 a.m. UTC
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(+)

-- 
2.32.0

Comments

Tom Rini July 15, 2021, 1:28 a.m. UTC | #1
On Fri, Jun 18, 2021 at 11:35:59AM +0930, Joel Stanley wrote:

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


Applied to u-boot/master, thanks!

-- 
Tom
diff mbox series

Patch

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