env: Move env_valid to env.h

This enum is somewhat widely used to determine if the environment is valid
or not. Move it to the common environment header file.

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

diff --git a/env/flash.c b/env/flash.c
index a26d94309d16e880f1fe4830ab1abf966351641c..7a73466cf2517a5a4c89e0ba752af1a58d6b9f45 100644 (file)
--- a/env/flash.c
+++ b/env/flash.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
 #include <environment.h>
 #include <linux/stddef.h>
 #include <malloc.h>

diff --git a/env/nowhere.c b/env/nowhere.c
index ea6c32eb3b77224eabf992cbd8ce333281ab4db4..7db4eec84560e7db6e7156d77abaf45a3b2fe360 100644 (file)
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
 #include <environment.h>
 #include <linux/stddef.h>
 

diff --git a/include/env.h b/include/env.h
index 727f58528f9d3f3d4b9f9d01cbfbcbcd49b1098b..b59c3c36f20238ccd61f38cb1a3772c45e925b24 100644 (file)
--- a/include/env.h
+++ b/include/env.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Common environment functions
+ * Common environment functions and definitions
  *
  * (C) Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -14,6 +14,13 @@
 
 struct environment_s;
 
+/* Value for environment validity */
+enum env_valid {
+       ENV_INVALID,    /* No valid environment */
+       ENV_VALID,      /* First or only environment is valid */
+       ENV_REDUND,     /* Redundant environment is valid */
+};
+
 /**
  * env_get_id() - Gets a sequence number for the environment
  *

diff --git a/include/environment.h b/include/environment.h
index 44a527e1fa141e9a86e95daa5c6d9a258b9aee8b..c3e8d7840a88dd402d5e29183448bfe242d783ee 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -165,13 +165,6 @@ extern const unsigned char default_environment[];
 #include <env_flags.h>
 #include <search.h>
 
-/* Value for environment validity */
-enum env_valid {
-       ENV_INVALID,    /* No valid environment */
-       ENV_VALID,      /* First or only environment is valid */
-       ENV_REDUND,     /* Redundant environment is valid */
-};
-
 enum env_location {
        ENVL_UNKNOWN,
        ENVL_EEPROM,