diff options
| author | Tom Rini <trini@konsulko.com> | 2025-06-20 12:54:41 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-06-20 12:57:47 -0600 |
| commit | dbf7fd557a73ded3141db3c2cf5c572989378825 (patch) | |
| tree | 3ddc26559c485e357e1d0a72d8ec2551250831cf /env/common.c | |
| parent | 73fd2456231fe12db3bd5dbdab3f9f62bd8e643d (diff) | |
| parent | 224224c9fa287bed428d5c507b8926357191848a (diff) | |
Merge patch series "Consistent Kconfig environment options CONFIG_ENV_ prefix"
Marek Vasut <marek.vasut+renesas@mailbox.org> 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/20250609192701.20260-1-marek.vasut+renesas@mailbox.org
Diffstat (limited to 'env/common.c')
| -rw-r--r-- | env/common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/env/common.c b/env/common.c index 86122582bc1..1e23c5de436 100644 --- a/env/common.c +++ b/env/common.c @@ -466,7 +466,7 @@ int env_import(const char *buf, int check, int flags) return -EIO; } -#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT +#ifdef CONFIG_ENV_REDUNDANT static unsigned char env_flags; int env_check_redund(const char *buf1, int buf1_read_fail, @@ -543,7 +543,7 @@ int env_import_redund(const char *buf1, int buf1_read_fail, return env_import((char *)ep, 0, flags); } -#endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */ +#endif /* CONFIG_ENV_REDUNDANT */ /* Export the environment and generate CRC for it. */ int env_export(env_t *env_out) @@ -560,7 +560,7 @@ int env_export(env_t *env_out) env_out->crc = crc32(0, env_out->data, ENV_SIZE); -#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT +#ifdef CONFIG_ENV_REDUNDANT env_out->flags = ++env_flags; /* increase the serial */ #endif |