Merge tag 'u-boot-atmel-fixes-2020.01-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / env / flash.c

diff --git a/env/flash.c b/env/flash.c
index 231a5fdf24d0038248759b420ea2747ceabb1593..b487e6701ef82632372cbff55f307362112ceb09 100644 (file)
--- a/env/flash.c
+++ b/env/flash.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <search.h>
 #include <errno.h>
+#include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -28,11 +29,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) && \