diff options
| author | Tom Rini <trini@konsulko.com> | 2025-07-07 14:10:59 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-07-07 14:10:59 -0600 |
| commit | 6d0b8874fde96c88e866c1e5ae0018354b7cd7d6 (patch) | |
| tree | fc498e7eaa23b8d27c701648bd3d0f92160bde39 /env/common.c | |
| parent | e37de002fac3895e8d0b60ae2015e17bb33e2b5b (diff) | |
| parent | 7598b469c16d97128d9c22839b06d94c5c331a7e (diff) | |
Merge branch 'next'
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 |