diff options
| author | Simon Glass <sjg@chromium.org> | 2019-08-01 09:47:04 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-11 16:43:41 -0400 |
| commit | db19701039bc78b5870d74e0d7ecaf4f9e4d8d87 (patch) | |
| tree | 12eb809d845ba1933b49b79f2f139553548cb654 | |
| parent | be54ec1624fb9a31b3fa30d55662d2c7b0832162 (diff) | |
| download | u-boot-db19701039bc78b5870d74e0d7ecaf4f9e4d8d87.tar.gz | |
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>
| -rw-r--r-- | env/flash.c | 1 | ||||
| -rw-r--r-- | env/nowhere.c | 1 | ||||
| -rw-r--r-- | include/env.h | 9 | ||||
| -rw-r--r-- | include/environment.h | 7 |
4 files changed, 10 insertions, 8 deletions
diff --git a/env/flash.c b/env/flash.c index a26d94309d..7a73466cf2 100644 --- 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 ea6c32eb3b..7db4eec845 100644 --- 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 727f58528f..b59c3c36f2 100644 --- 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 44a527e1fa..c3e8d7840a 100644 --- 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, |