diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-10 11:28:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-12 11:08:00 -0500 |
| commit | cb6617a77f81df47b72cc4115faf7bd5b1f7cfeb (patch) | |
| tree | 3ae4fc88f4ea4de3f78de75bb60e5d761eb9e6cb /include/env_internal.h | |
| parent | 38d5fa48f42f9ad82f77038a501cb8d0e900ea2c (diff) | |
| download | u-boot-cb6617a77f81df47b72cc4115faf7bd5b1f7cfeb.tar.gz | |
defconfigs: Migrate CONFIG_SYS_REDUNDAND_ENVIRONMENT
Move this symbol to Kconfig. As part of this we can drop a UBI-specific
symbol that was a stop-gap for not having this particular symbol in
Kconfig.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/env_internal.h')
| -rw-r--r-- | include/env_internal.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/env_internal.h b/include/env_internal.h index 88c36b32a1..d520e6a55b 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -58,21 +58,12 @@ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) # define ENV_IS_EMBEDDED # endif -# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND) -# define CONFIG_SYS_REDUNDAND_ENVIRONMENT -# endif # ifdef CONFIG_ENV_IS_EMBEDDED # error "do not define CONFIG_ENV_IS_EMBEDDED in your board config" # error "it is calculated automatically for you" # endif #endif /* CONFIG_ENV_IS_IN_FLASH */ -#if defined(CONFIG_ENV_IS_IN_MMC) -# ifdef CONFIG_ENV_OFFSET_REDUND -# define CONFIG_SYS_REDUNDAND_ENVIRONMENT -# endif -#endif - #if defined(CONFIG_ENV_IS_IN_NAND) # if defined(CONFIG_ENV_OFFSET_OOB) # ifdef CONFIG_ENV_OFFSET_REDUND @@ -85,9 +76,6 @@ extern unsigned long nand_env_oob_offset; # ifndef CONFIG_ENV_OFFSET # error "Need to define CONFIG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND" # endif -# ifdef CONFIG_ENV_OFFSET_REDUND -# define CONFIG_SYS_REDUNDAND_ENVIRONMENT -# endif # endif /* CONFIG_ENV_OFFSET_OOB */ # ifndef CONFIG_ENV_SIZE # error "Need to define CONFIG_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND" @@ -101,9 +89,6 @@ extern unsigned long nand_env_oob_offset; # ifndef CONFIG_ENV_UBI_VOLUME # error "Need to define CONFIG_ENV_UBI_VOLUME when using CONFIG_ENV_IS_IN_UBI" # endif -# if defined(CONFIG_ENV_UBI_IS_VOLUME_REDUND) -# define CONFIG_SYS_REDUNDAND_ENVIRONMENT -# endif # ifndef CONFIG_ENV_SIZE # error "Need to define CONFIG_ENV_SIZE when using CONFIG_ENV_IS_IN_UBI" # endif |