[U-Boot,28/39] env: Move env_valid to env.h

Message ID	20190728140357.137295-29-sjg@chromium.org
State	Superseded
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Sun, 28 Jul 2019 08:03:45 -0600 Message-Id: <20190728140357.137295-29-sjg@chromium.org> In-Reply-To: <20190728140357.137295-1-sjg@chromium.org> References: <20190728140357.137295-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Joe Hershberger <joe.hershberger@ni.com>, Tom Rini <trini@konsulko.com> Subject: [U-Boot] [PATCH 28/39] env: Move env_valid to env.h Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	env: common: Remove environment definitions from common.h \| expand [U-Boot,00/39] env: common: Remove environment definitions from common.h [U-Boot,01/39] common: Move gzip functions into a new gzip header [U-Boot,02/39] common: Drop the dpram_... functions [U-Boot,03/39] common: Move lcd_setmem() to lcd.h [U-Boot,04/39] common: Remove video_setmem() [U-Boot,05/39] env: Create a new file for environment functions [U-Boot,06/39] env: Move get_env_id() to env.h [U-Boot,07/39] env: Move env_get_f() to env.h [U-Boot,08/39] env: Move env_init() to env.h [U-Boot,09/39] env: Move env_relocate() to env.h [U-Boot,10/39] env: Move envmatch() to env.h [U-Boot,11/39] env: Move env_set_hex() to env.h [U-Boot,12/39] env: Move env_set_ulong() to env.h [U-Boot,13/39] env: Move env_get_ulong() to env.h [U-Boot,14/39] env: Move env_get_yesno() to env.h [U-Boot,15/39] env: Move env_get_hex() to env.h [U-Boot,16/39] env: Move env_set() to env.h [U-Boot,17/39] env: Move env_get() to env.h [U-Boot,18/39] env: Move eth_env_get/set_enetaddr() to env.h [U-Boot,19/39] env: Move uncommon functions to env.h [U-Boot,20/39] env: Move set_default_vars to env.h [U-Boot,21/39] env: Move env_load/save functions to env.h [U-Boot,22/39] env: Move env import/export functions to env.h [U-Boot,23/39] env: Drop env_crc_update() [U-Boot,24/39] env: Move get/set_default_env() to env.h [U-Boot,25/39] env: Move env_get_char() to env.h [U-Boot,26/39] env: Move env_reloc() to env.h [U-Boot,27/39] env: Rename environment to embedded_environment [U-Boot,28/39] env: Move env_valid to env.h [U-Boot,29/39] env: Move callback definitions to env.h [U-Boot,30/39] env: Drop the ENTRY typdef [U-Boot,31/39] env: Drop _ENTRY [U-Boot,32/39] env: Rename the redundancy flags [U-Boot,33/39] env: Drop the ACTION typedef [U-Boot,34/39] env: Drop the double underscores in search.h [U-Boot,35/39] env: Move TOTAL_MALLOC_LEN to environment.h [U-Boot,36/39] env: Drop environment.h header file where not needed [U-Boot,37/39] env: Rename environment.h to env_internal.h [U-Boot,38/39] Drop PCMCIA [U-Boot,39/39] common: Add a note about the effort to reduce common.h

Message ID

20190728140357.137295-29-sjg@chromium.org

State

Superseded

Delegated to:

Tom Rini

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Date: Sun, 28 Jul 2019 08:03:45 -0600
Message-Id: <20190728140357.137295-29-sjg@chromium.org>
In-Reply-To: <20190728140357.137295-1-sjg@chromium.org>
References: <20190728140357.137295-1-sjg@chromium.org>
MIME-Version: 1.0
Cc: Joe Hershberger <joe.hershberger@ni.com>, Tom Rini <trini@konsulko.com>
Subject: [U-Boot] [PATCH 28/39] env: Move env_valid to env.h
Precedence: list
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

env: common: Remove environment definitions from common.h | expand

Commit Message

Simon Glass July 28, 2019, 2:03 p.m. UTC

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>
---

 env/flash.c           | 1 +
 env/nowhere.c         | 1 +
 include/env.h         | 9 ++++++++-
 include/environment.h | 7 -------
 4 files changed, 10 insertions(+), 8 deletions(-)

Comments

Joe Hershberger July 30, 2019, 8:56 p.m. UTC | #1

On Sun, Jul 28, 2019 at 9:19 AM Simon Glass <sjg@chromium.org> wrote:
>
> 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 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 82214d973e..93a4c3ed6b 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,

[U-Boot,28/39] env: Move env_valid to env.h

Commit Message

Comments

Patch