diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-18 20:02:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-20 18:31:24 -0500 |
| commit | a8992e788aba46f6f129af3111682be86236074f (patch) | |
| tree | ab5b83a45f55ad016ef020320bb2960cf7337f27 /env | |
| parent | 3eee45d93681a9c6bb67b73068da4dc179ae4e7f (diff) | |
| download | u-boot-a8992e788aba46f6f129af3111682be86236074f.tar.gz u-boot-a8992e788aba46f6f129af3111682be86236074f.tar.xz u-boot-a8992e788aba46f6f129af3111682be86236074f.zip | |
env: Remove useless CONFIG_ENV_SIZE_REDUND and fix ENV_IS_REDUND check
We have CONFIG_ENV_SIZE_IS_REDUND but don't really use it. We have one
board where we can simply multiple CONFIG_ENV_SIZE by two for the same
result. The other place where we could but were not previously using
this is for where env_internal.h checks for if we should set
ENV_IS_EMBEDDED. This seems like the most likely use, historically, of
the variable, but it was not used. Add logic to check for this now.
Cc: Wolfgang Denk <wd@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 7 | ||||
| -rw-r--r-- | env/flash.c | 5 | ||||
| -rw-r--r-- | env/mmc.c | 5 | ||||
| -rw-r--r-- | env/nand.c | 5 | ||||
| -rw-r--r-- | env/sata.c | 2 |
5 files changed, 1 insertions, 23 deletions
diff --git a/env/Kconfig b/env/Kconfig index 337787051d..0b97af42b1 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -132,7 +132,6 @@ config ENV_IS_IN_FLASH RAM, your target system will be dead. CONFIG_ENV_ADDR_REDUND - CONFIG_ENV_SIZE_REDUND These settings describe a second storage area used to hold a redundant copy of the environment data, so that there is @@ -195,12 +194,6 @@ config ENV_IS_IN_MMC This value is also in units of bytes, but must also be aligned to an MMC sector boundary. - CONFIG_ENV_SIZE_REDUND (optional): - - This value need not be set, even when CONFIG_ENV_OFFSET_REDUND is - set. If this value is set, it must be set to the same value as - CONFIG_ENV_SIZE. - config ENV_IS_IN_NAND bool "Environment in a NAND device" depends on !CHAIN_OF_TRUST diff --git a/env/flash.c b/env/flash.c index 231a5fdf24..b94ed2b04f 100644 --- a/env/flash.c +++ b/env/flash.c @@ -28,11 +28,6 @@ DECLARE_GLOBAL_DATA_PTR; # endif #endif -#if defined(CONFIG_ENV_SIZE_REDUND) && \ - (CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE) -#error CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE -#endif - /* TODO(sjg@chromium.org): Figure out all these special cases */ #if (!defined(CONFIG_MICROBLAZE) && !defined(CONFIG_ARCH_ZYNQ) && \ !defined(CONFIG_TARGET_MCCMON6) && !defined(CONFIG_TARGET_X600) && \ @@ -22,11 +22,6 @@ #define __STR(X) #X #define STR(X) __STR(X) -#if defined(CONFIG_ENV_SIZE_REDUND) && \ - (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE) -#error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE -#endif - DECLARE_GLOBAL_DATA_PTR; #if !defined(CONFIG_ENV_OFFSET) diff --git a/env/nand.c b/env/nand.c index 9f3dc635cf..e631bf2fda 100644 --- a/env/nand.c +++ b/env/nand.c @@ -31,11 +31,6 @@ #error CONFIG_ENV_OFFSET_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND #endif -#if defined(CONFIG_ENV_SIZE_REDUND) && \ - (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE) -#error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE -#endif - #ifndef CONFIG_ENV_RANGE #define CONFIG_ENV_RANGE CONFIG_ENV_SIZE #endif diff --git a/env/sata.c b/env/sata.c index 9369710081..8bfcc94306 100644 --- a/env/sata.c +++ b/env/sata.c @@ -16,7 +16,7 @@ #include <sata.h> #include <search.h> -#if defined(CONFIG_ENV_SIZE_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND) +#if defined(CONFIG_ENV_OFFSET_REDUND) #error ENV REDUND not supported #endif |