rockchip: configs: only add available BOOT_TARGET_DEVICES

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

diff --git a/include/environment.h b/include/environment.h
index b4f93663da78239ad990c230caf35f6a054ce707..7b9821638960777669802c38175b0e38f78630d7 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -198,7 +198,6 @@ enum env_valid {
 };
 
 enum env_location {
-       ENVL_DATAFLASH,
        ENVL_EEPROM,
        ENVL_EXT4,
        ENVL_FAT,
@@ -227,17 +226,19 @@ struct env_driver {
         * will read from gd->env_addr.
         *
         * @index: Index of character to read (0=first)
-        * @return character read
+        * @return character read, or -ve on error
         */
-       unsigned char (*get_char)(int index);
+       int (*get_char)(int index);
 
        /**
         * load() - Load the environment from storage
         *
         * This method is optional. If not provided, no environment will be
         * loaded.
+        *
+        * @return 0 if OK, -ve on error
         */
-       void (*load)(void);
+       int (*load)(void);
 
        /**
         * save() - Save the environment to storage
@@ -282,7 +283,7 @@ extern struct hsearch_data env_htab;
 void env_crc_update(void);
 
 /* Look up the variable from the default environment */
-char *getenv_default(const char *name);
+char *env_get_default(const char *name);
 
 /* [re]set to the default environment */
 void set_default_env(const char *s);
@@ -325,6 +326,13 @@ int env_get_char(int index);
  */
 int env_load(void);
 
+/**
+ * env_save() - Save the environment to storage
+ *
+ * @return 0 if OK, -ve on error
+ */
+int env_save(void);
+
 #endif /* DO_DEPS_ONLY */
 
 #endif /* _ENVIRONMENT_H_ */