Merge branch 'i2c'

[u-boot] / include / environment.h

diff --git a/include/environment.h b/include/environment.h
index bb109649f6bab7492ba9242d64fc43784c8ed2ab..26b07120da152166f250ce69f1b9073e4ae58ec6 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -69,6 +69,22 @@
 # endif
 #endif /* CFG_ENV_IS_IN_FLASH */
 
+#if defined(CFG_ENV_IS_IN_NAND)
+# ifndef CFG_ENV_OFFSET
+#  error "Need to define CFG_ENV_OFFSET when using CFG_ENV_IS_IN_NAND"
+# endif
+# ifndef CFG_ENV_SIZE
+#  error "Need to define CFG_ENV_SIZE when using CFG_ENV_IS_IN_NAND"
+# endif
+# ifdef CFG_ENV_OFFSET_REDUND
+#  define CFG_REDUNDAND_ENVIRONMENT
+# endif
+# if defined(CONFIG_NAND_U_BOOT)
+/* Use embedded environment in NAND boot versions */
+#  define ENV_IS_EMBEDDED      1
+# endif
+#endif /* CFG_ENV_IS_IN_NAND */
+
 
 #ifdef CFG_REDUNDAND_ENVIRONMENT
 # define ENV_HEADER_SIZE       (sizeof(unsigned long) + 1)