env: Move set_default_vars to env.h

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

diff --git a/include/environment.h b/include/environment.h
index d29f82cb5d6faf148f126df5aa2207928a1628ef..97d48865994803feed9af542f5ec1338db4dcf03 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _ENVIRONMENT_H_
@@ -158,21 +157,11 @@ extern env_t environment;
 #endif /* ENV_IS_EMBEDDED */
 
 extern const unsigned char default_environment[];
-extern env_t *env_ptr;
 
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
 extern void env_reloc(void);
 #endif
 
-#ifdef CONFIG_ENV_IS_IN_MMC
-#include <mmc.h>
-
-extern int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr);
-# ifdef CONFIG_SYS_MMC_ENV_PART
-extern uint mmc_get_env_part(struct mmc *mmc);
-# endif
-#endif
-
 #ifndef DO_DEPS_ONLY
 
 #include <env_attr.h>
@@ -188,6 +177,7 @@ enum env_valid {
 };
 
 enum env_location {
+       ENVL_UNKNOWN,
        ENVL_EEPROM,
        ENVL_EXT4,
        ENVL_FAT,
@@ -202,24 +192,21 @@ enum env_location {
        ENVL_NOWHERE,
 
        ENVL_COUNT,
-       ENVL_UNKNOWN,
+};
+
+/* value for the various operations we want to perform on the env */
+enum env_operation {
+       ENVOP_GET_CHAR, /* we want to call the get_char function */
+       ENVOP_INIT,     /* we want to call the init function */
+       ENVOP_LOAD,     /* we want to call the load function */
+       ENVOP_SAVE,     /* we want to call the save function */
+       ENVOP_ERASE,    /* we want to call the erase function */
 };
 
 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
         *
@@ -239,6 +226,15 @@ struct env_driver {
         */
        int (*save)(void);
 
+       /**
+        * erase() - Erase the environment on storage
+        *
+        * This method is optional and required for 'eraseenv' to work.
+        *
+        * @return 0 if OK, -ve on error
+        */
+       int (*erase)(void);
+
        /**
         * init() - Set up the initial pre-relocation environment
         *
@@ -276,10 +272,7 @@ void env_crc_update(void);
 char *env_get_default(const char *name);
 
 /* [re]set to the default environment */
-void set_default_env(const char *s);
-
-/* [re]set individual variables to their value in the default environment */
-int set_default_vars(int nvars, char * const vars[]);
+void set_default_env(const char *s, int flags);
 
 /* Import from binary representation into hash table */
 int env_import(const char *buf, int check);
@@ -289,20 +282,14 @@ 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
 
-/**
- * env_driver_lookup_default() - Look up the default environment driver
- *
- * @return pointer to driver, or NULL if none (which should not happen)
- */
-struct env_driver *env_driver_lookup_default(void);
-
 /**
  * env_get_char() - Get a character from the early environment
  *
- * This reads from the pre-relocation environemnt
+ * This reads from the pre-relocation environment
  *
  * @index: Index of character to read (0 = first)
  * @return character read, or -ve on error
@@ -323,6 +310,13 @@ int env_load(void);
  */
 int env_save(void);
 
+/**
+ * env_erase() - Erase the environment on storage
+ *
+ * @return 0 if OK, -ve on error
+ */
+int env_erase(void);
+
 #endif /* DO_DEPS_ONLY */
 
 #endif /* _ENVIRONMENT_H_ */