From: Andrew Davis <afd@ti.com>
Date: Fri, 15 Sep 2023 14:43:23 +0000 (-0500)
Subject: Makefile: Force regeneration of env.txt
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=ce743f168a31526508a06280e2c6b9c531a0360c;p=u-boot.git

Makefile: Force regeneration of env.txt

If the source .env file changes to one that is also older than the
generated env.txt file then the .env file is not regenerated. This
means when switching board configs we do not regenerate the env.

This can be tested with:

$ make j721e_evm_a72_defconfig
$ make # this may fail to complete but that is okay for this test
$ make am64x_evm_a53_defconfig
$ make
$ vim include/generated/env.txt

Note this is still the J721e env not the AM64 config as expected.

As ENV_FILE is set based on configuration, regenerate anytime
autoconf.h changes.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/Makefile b/Makefile
index f67888b1b5..4a2d99e102 100644
--- a/Makefile
+++ b/Makefile
@@ -1831,7 +1831,7 @@ quiet_cmd_envc = ENVC    $@
 		touch $@ ; \
 	fi
 
-include/generated/env.txt: $(wildcard $(ENV_FILE))
+include/generated/env.txt: $(wildcard $(ENV_FILE)) include/generated/autoconf.h
 	$(call cmd,envc)
 
 # Write out the resulting environment, converted to a C string