summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2025-06-20 12:54:41 -0600
committerTom Rini <[email protected]>2025-06-20 12:57:47 -0600
commitdbf7fd557a73ded3141db3c2cf5c572989378825 (patch)
tree3ddc26559c485e357e1d0a72d8ec2551250831cf /Makefile
parent73fd2456231fe12db3bd5dbdab3f9f62bd8e643d (diff)
parent224224c9fa287bed428d5c507b8926357191848a (diff)
Merge patch series "Consistent Kconfig environment options CONFIG_ENV_ prefix"
Marek Vasut <[email protected]> says: Rename the environment related variables and add ENV_ prefix, so that all configuration options which are related to environment would have an CONFIG_ENV_ prefix. No functional change. Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cf63a74befb..03290bbbbd4 100644
--- a/Makefile
+++ b/Makefile
@@ -1977,7 +1977,7 @@ ifeq ($(wildcard $(LDSCRIPT)),)
@/bin/false
endif
-ifeq ($(CONFIG_USE_DEFAULT_ENV_FILE),y)
+ifeq ($(CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE),y)
prepare1: $(defaultenv_h)
envtools: $(defaultenv_h)
@@ -2057,7 +2057,7 @@ $(timestamp_h): $(srctree)/Makefile FORCE
$(dt_h): $(srctree)/Makefile FORCE
$(call filechk,dt.h)
-$(defaultenv_h): $(CONFIG_DEFAULT_ENV_FILE:"%"=%) FORCE
+$(defaultenv_h): $(CONFIG_ENV_DEFAULT_ENV_TEXT_FILE:"%"=%) FORCE
$(call filechk,defaultenv.h)
# ---------------------------------------------------------------------------