Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-13 00:17:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

env: Avoid using a leftover text-environment file

Browse source 
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>
This commit is contained in:
Simon Glass 2022-03-11 22:37:23 -07:00 committed by Tom Rini
parent 64b78f5721
commit f432eb6d8a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -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 # 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 # 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 $@ quiet_cmd_gen_envp = ENVP $@
cmd_gen_envp = \ cmd_gen_envp = \
if [ -s "$(ENV_FILE)" ]; then \ if [ -s "$(ENV_FILE)" ]; then \
@ -1844,6 +1846,7 @@ quiet_cmd_gen_envp = ENVP $@
-I$(srctree)/arch/$(ARCH)/include \ -I$(srctree)/arch/$(ARCH)/include \
$< -o $@; \ $< -o $@; \
else \ else \
rm $@; \
touch $@ ; \ touch $@ ; \
fi fi
include/generated/env.in: include/generated/env.txt FORCE include/generated/env.in: include/generated/env.txt FORCE