rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM

[platform/kernel/u-boot.git] / include / environment.h

diff --git a/include/environment.h b/include/environment.h
index 26b0712..047f5f0 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -69,38 +69,55 @@
 # endif
 #endif /* CFG_ENV_IS_IN_FLASH */
 
-#if defined(CFG_ENV_IS_IN_NAND)
+#if defined(CONFIG_ENV_IS_IN_NAND)
 # ifndef CFG_ENV_OFFSET
-#  error "Need to define CFG_ENV_OFFSET when using CFG_ENV_IS_IN_NAND"
+#  error "Need to define CFG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"
 # endif
 # ifndef CFG_ENV_SIZE
-#  error "Need to define CFG_ENV_SIZE when using CFG_ENV_IS_IN_NAND"
+#  error "Need to define CFG_ENV_SIZE when using CONFIG_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 */
+# ifdef CFG_ENV_IS_EMBEDDED
 #  define ENV_IS_EMBEDDED      1
 # endif
-#endif /* CFG_ENV_IS_IN_NAND */
+#endif /* CONFIG_ENV_IS_IN_NAND */
 
+#ifdef USE_HOSTCC
+# include <stdint.h>
+#else
+# include <linux/types.h>
+#endif
 
 #ifdef CFG_REDUNDAND_ENVIRONMENT
-# define ENV_HEADER_SIZE       (sizeof(unsigned long) + 1)
+# define ENV_HEADER_SIZE       (sizeof(uint32_t) + 1)
 #else
-# define ENV_HEADER_SIZE       (sizeof(unsigned long))
+# define ENV_HEADER_SIZE       (sizeof(uint32_t))
 #endif
 
 
 #define ENV_SIZE (CFG_ENV_SIZE - ENV_HEADER_SIZE)
 
 typedef        struct environment_s {
-       unsigned long   crc;            /* CRC32 over data bytes        */
+       uint32_t        crc;            /* CRC32 over data bytes        */
 #ifdef CFG_REDUNDAND_ENVIRONMENT
        unsigned char   flags;          /* active/obsolete flags        */
 #endif
        unsigned char   data[ENV_SIZE]; /* Environment data             */
 } env_t;
 
+/* Function that returns a character from the environment */
+unsigned char env_get_char (int);
+
+/* Function that returns a pointer to a value from the environment */
+unsigned char *env_get_addr(int);
+unsigned char env_get_char_memory (int index);
+
+/* Function that updates CRC of the enironment */
+void env_crc_update (void);
+
+/* [re]set to the default environment */
+void set_default_env(void);
+
 #endif /* _ENVIRONMENT_H_ */