diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-19 04:02:07 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-21 02:31:24 +0300 |
| commit | a8992e788aba46f6f129af3111682be86236074f (patch) | |
| tree | ab5b83a45f55ad016ef020320bb2960cf7337f27 /include/env_internal.h | |
| parent | 3eee45d93681a9c6bb67b73068da4dc179ae4e7f (diff) | |
| download | u-boot-a8992e788aba46f6f129af3111682be86236074f.tar.xz | |
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 'include/env_internal.h')
| -rw-r--r-- | include/env_internal.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/env_internal.h b/include/env_internal.h index d520e6a55b..b8158c0e0b 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -50,8 +50,11 @@ # else # error "Both CONFIG_ENV_SECT_SIZE and CONFIG_ENV_SIZE undefined" # endif -# if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND) -# define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE +# if defined(CONFIG_ENV_ADDR_REDUND) && \ + ((CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \ + (CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE) <= \ + (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)) +# define ENV_IS_EMBEDDED # endif # if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \ (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= \ |