[U-Boot] [PATCH v2 22/40] env: Move env_load/save functions to env.h

Simon Glass sjg at chromium.org
Thu Aug 1 15:46:57 UTC 2019


Move these function to the new header file.

Acked-by: Joe Hershberger <joe.hershberger at ni.com>
Signed-off-by: Simon Glass <sjg at chromium.org>
---

Changes in v2: None

 include/env.h         | 21 +++++++++++++++++++++
 include/environment.h | 21 ---------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/include/env.h b/include/env.h
index fc3519f8c5..69ccfb706e 100644
--- a/include/env.h
+++ b/include/env.h
@@ -198,4 +198,25 @@ void env_fix_drivers(void);
  */
 int env_set_default_vars(int nvars, char *const vars[], int flags);
 
+/**
+ * env_load() - Load the environment from storage
+ *
+ * @return 0 if OK, -ve on error
+ */
+int env_load(void);
+
+/**
+ * env_save() - Save the environment to storage
+ *
+ * @return 0 if OK, -ve on error
+ */
+int env_save(void);
+
+/**
+ * env_erase() - Erase the environment on storage
+ *
+ * @return 0 if OK, -ve on error
+ */
+int env_erase(void);
+
 #endif
diff --git a/include/environment.h b/include/environment.h
index 97d4886599..b921b8f28e 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -296,27 +296,6 @@ int env_import_redund(const char *buf1, int buf1_status,
  */
 int env_get_char(int index);
 
-/**
- * env_load() - Load the environment from storage
- *
- * @return 0 if OK, -ve on error
- */
-int env_load(void);
-
-/**
- * env_save() - Save the environment to storage
- *
- * @return 0 if OK, -ve on error
- */
-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_ */
-- 
2.22.0.709.g102302147b-goog



More information about the U-Boot mailing list