diff options
| author | Simon Glass <sjg@chromium.org> | 2019-08-01 09:47:08 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-11 16:43:41 -0400 |
| commit | d3716dd64bb8bb4c4ba2d19bac164d24ada72a68 (patch) | |
| tree | 0813ae10d149c97f5dedb88624366dff087dcd05 /include | |
| parent | 25e51e90feec10b7d534b123cd9c4ed7a3a2dc1a (diff) | |
| download | u-boot-d3716dd64bb8bb4c4ba2d19bac164d24ada72a68.tar.gz u-boot-d3716dd64bb8bb4c4ba2d19bac164d24ada72a68.tar.bz2 u-boot-d3716dd64bb8bb4c4ba2d19bac164d24ada72a68.zip | |
env: Rename the redundancy flags
Add an ENV prefix to these two flags so that it is clear what they relate
to. Also move them to env.h since they are part of the public API. Use an
enum rather than a #define to tie them together.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/env.h | 6 | ||||
| -rw-r--r-- | include/environment.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/env.h b/include/env.h index 271cb3e888..a74a261337 100644 --- a/include/env.h +++ b/include/env.h @@ -55,6 +55,12 @@ struct env_clbk_tbl { {#name, callback} #endif +/** enum env_redund_flags - Flags for the redundand_environment */ +enum env_redund_flags { + ENV_REDUND_OBSOLETE = 0, + ENV_REDUND_ACTIVE = 1, +}; + /** * env_get_id() - Gets a sequence number for the environment * diff --git a/include/environment.h b/include/environment.h index c3e8d7840a..70ee0fdb19 100644 --- a/include/environment.h +++ b/include/environment.h @@ -135,9 +135,6 @@ extern unsigned long nand_env_oob_offset; #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT # define ENV_HEADER_SIZE (sizeof(uint32_t) + 1) - -# define ACTIVE_FLAG 1 -# define OBSOLETE_FLAG 0 #else # define ENV_HEADER_SIZE (sizeof(uint32_t)) #endif @@ -147,7 +144,7 @@ extern unsigned long nand_env_oob_offset; typedef struct environment_s { uint32_t crc; /* CRC32 over data bytes */ #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT - unsigned char flags; /* active/obsolete flags */ + unsigned char flags; /* active/obsolete flags ENVF_REDUND_ */ #endif unsigned char data[ENV_SIZE]; /* Environment data */ } env_t; |