Skip to content
Snippets Groups Projects
Commit b218ccb5 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Redundant environment: move flag definitions to header file


Instead of defining the flags sevaral times in different source files
(which is error prone), move them to a central place in a header file.

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent d9c27253
No related branches found
No related tags found
No related merge requests found
...@@ -32,11 +32,6 @@ ...@@ -32,11 +32,6 @@
#include <i2c.h> #include <i2c.h>
#endif #endif
#ifdef CONFIG_ENV_OFFSET_REDUND
#define ACTIVE_FLAG 1
#define OBSOLETE_FLAG 0
#endif
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
env_t *env_ptr = NULL; env_t *env_ptr = NULL;
......
...@@ -71,9 +71,6 @@ static env_t *flash_addr_new = (env_t *)CONFIG_ENV_ADDR_REDUND; ...@@ -71,9 +71,6 @@ static env_t *flash_addr_new = (env_t *)CONFIG_ENV_ADDR_REDUND;
/* CONFIG_ENV_ADDR is supposed to be on sector boundary */ /* CONFIG_ENV_ADDR is supposed to be on sector boundary */
static ulong end_addr = CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1; static ulong end_addr = CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1;
static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1; static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
#define ACTIVE_FLAG 1
#define OBSOLETE_FLAG 0
#endif /* CONFIG_ENV_ADDR_REDUND */ #endif /* CONFIG_ENV_ADDR_REDUND */
extern uchar default_environment[]; extern uchar default_environment[];
......
...@@ -122,6 +122,9 @@ ...@@ -122,6 +122,9 @@
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
# define ENV_HEADER_SIZE (sizeof(uint32_t) + 1) # define ENV_HEADER_SIZE (sizeof(uint32_t) + 1)
# define ACTIVE_FLAG 1
# define OBSOLETE_FLAG 0
#else #else
# define ENV_HEADER_SIZE (sizeof(uint32_t)) # define ENV_HEADER_SIZE (sizeof(uint32_t))
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment