Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / environment.h

diff --git a/include/environment.h b/include/environment.h
index a4060506fabb543ab291feb394c8059c8c1454aa..7986a242778d1cc3cf37ea29953b4e74e01308f0 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -188,6 +188,7 @@ enum env_valid {
 };
 
 enum env_location {
+       ENVL_UNKNOWN,
        ENVL_EEPROM,
        ENVL_EXT4,
        ENVL_FAT,
@@ -202,7 +203,6 @@ enum env_location {
        ENVL_NOWHERE,
 
        ENVL_COUNT,
-       ENVL_UNKNOWN,
 };
 
 /* value for the various operations we want to perform on the env */
@@ -217,17 +217,6 @@ struct env_driver {
        const char *name;
        enum env_location location;
 
-       /**
-        * get_char() - Read a character from the environment
-        *
-        * This method is optional. If not provided, a default implementation
-        * will read from gd->env_addr.
-        *
-        * @index: Index of character to read (0=first)
-        * @return character read, or -ve on error
-        */
-       int (*get_char)(int index);
-
        /**
         * load() - Load the environment from storage
         *
@@ -297,7 +286,8 @@ int env_export(env_t *env_out);
 
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
 /* Select and import one of two redundant environments */
-int env_import_redund(const char *buf1, const char *buf2);
+int env_import_redund(const char *buf1, int buf1_status,
+                     const char *buf2, int buf2_status);
 #endif
 
 /**