aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-22 15:44:16 +0200
committerWolfgang Denk <wd@denx.de>2010-07-04 23:52:42 +0200
commitb218ccb5435e64ac2318bb8b6c9594ef1cc724cd (patch)
tree930a4f5324454c3ce4bb695c959c115b24b8d39e
parentd9c27253ce333e2086b2d758b42dc3ecb8b34c3d (diff)
downloadu-boot-linaro-stable-b218ccb5435e64ac2318bb8b6c9594ef1cc724cd.tar.gz
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: Wolfgang Denk <wd@denx.de>
-rw-r--r--common/env_eeprom.c5
-rw-r--r--common/env_flash.c3
-rw-r--r--include/environment.h3
3 files changed, 3 insertions, 8 deletions
diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 4f7f0dbde..8fe59f822 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -32,11 +32,6 @@
#include <i2c.h>
#endif
-#ifdef CONFIG_ENV_OFFSET_REDUND
-#define ACTIVE_FLAG 1
-#define OBSOLETE_FLAG 0
-#endif
-
DECLARE_GLOBAL_DATA_PTR;
env_t *env_ptr = NULL;
diff --git a/common/env_flash.c b/common/env_flash.c
index ef0582d63..925c5a02d 100644
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -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 */
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;
-
-#define ACTIVE_FLAG 1
-#define OBSOLETE_FLAG 0
#endif /* CONFIG_ENV_ADDR_REDUND */
extern uchar default_environment[];
diff --git a/include/environment.h b/include/environment.h
index b9924fd77..203f73196 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -122,6 +122,9 @@
#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