env: Remove useless CONFIG_ENV_SIZE_REDUND and fix ENV_IS_REDUND check

[oweals/u-boot.git] / include / env_internal.h

diff --git a/include/env_internal.h b/include/env_internal.h
index d520e6a55b5c9fa38536894869f565352e2e0c18..b8158c0e0bc5c910017e626398f1904cf52e1fdb 100644 (file)
--- 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) <=                  \