From: Simon Glass <sjg@chromium.org>
Date: Sat, 12 Mar 2022 05:37:23 +0000 (-0700)
Subject: env: Avoid using a leftover text-environment file
X-Git-Tag: v2022.07~129
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f432eb6d8a9d8a9382f6e7f0096fb4ee4672b8e8;p=platform%2Fkernel%2Fu-boot.git

env: Avoid using a leftover text-environment file

If include/generated/environment.h exists (perhaps leftover from a build
of another board) it is used, even if the board currently being built does
not have a text environment.

This causes a build error. Fix it by emptying the file if it should not be
there.

Fixes: https://source.denx.de/u-boot/u-boot/-/issues/9
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Sean Anderson <seanga2@gmail.com>
Tested-by: Sean Anderson <seanga2@gmail.com>
---

diff --git a/Makefile b/Makefile
index c1d4702..4672147 100644
--- a/Makefile
+++ b/Makefile
@@ -1833,7 +1833,9 @@ ENV_FILE := $(if $(ENV_SOURCE_FILE),$(ENV_FILE_CFG),$(wildcard $(ENV_FILE_BOARD)
 
 # Run the environment text file through the preprocessor, but only if it is
 # non-empty, to save time and possible build errors if something is wonky with
-# the board
+# the board.
+# If there is no ENV_FILE, produce an empty output file, to prevent a previous
+# build's file being used in the case of in-tree builds.
 quiet_cmd_gen_envp = ENVP    $@
       cmd_gen_envp = \
 	if [ -s "$(ENV_FILE)" ]; then \
@@ -1844,6 +1846,7 @@ quiet_cmd_gen_envp = ENVP    $@
 			-I$(srctree)/arch/$(ARCH)/include \
 			$< -o $@; \
 	else \
+		rm $@; \
 		touch $@ ; \
 	fi
 include/generated/env.in: include/generated/env.txt FORCE