diff options
| author | Tom Rini <[email protected]> | 2025-06-20 12:54:41 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-06-20 12:57:47 -0600 |
| commit | dbf7fd557a73ded3141db3c2cf5c572989378825 (patch) | |
| tree | 3ddc26559c485e357e1d0a72d8ec2551250831cf /include/env_default.h | |
| parent | 73fd2456231fe12db3bd5dbdab3f9f62bd8e643d (diff) | |
| parent | 224224c9fa287bed428d5c507b8926357191848a (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 'include/env_default.h')
| -rw-r--r-- | include/env_default.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/env_default.h b/include/env_default.h index 60c39f9853f..9caf22cdd1d 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -16,7 +16,7 @@ #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { ENV_CRC, /* CRC Sum */ -#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT +#ifdef CONFIG_ENV_REDUNDANT 1, /* Flags: valid */ #endif { @@ -27,7 +27,7 @@ char default_environment[] = { #else const char default_environment[] = { #endif -#ifndef CONFIG_USE_DEFAULT_ENV_FILE +#ifndef CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE #ifdef CONFIG_ENV_CALLBACK_LIST_DEFAULT ENV_CALLBACK_VAR "=" CONFIG_ENV_CALLBACK_LIST_DEFAULT "\0" #endif @@ -136,7 +136,7 @@ const char default_environment[] = { "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" #endif "\0" -#else /* CONFIG_USE_DEFAULT_ENV_FILE */ +#else /* CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE */ #include "generated/defaultenv_autogenerated.h" #endif #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED |