summaryrefslogtreecommitdiff
path: root/board/zeus/zeus.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-12 16:13:12 +0200
committerWolfgang Denk <wd@denx.de>2008-09-12 16:13:12 +0200
commitafbc526336447a7357e9c82852df0377d09a8089 (patch)
tree63360d749d3f02916a1239b3862c68d41d3f3d19 /board/zeus/zeus.c
parentb476b032562aae5a09985f7e22232a5ee7042746 (diff)
parentdeeec4991a55de243787002ede24d2331d234fc8 (diff)
downloadu-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.zip
u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.tar.gz
u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.tar.bz2
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/zeus/zeus.c')
-rw-r--r--board/zeus/zeus.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c
index 2a4ec5c..6fa4eef 100644
--- a/board/zeus/zeus.c
+++ b/board/zeus/zeus.c
@@ -150,8 +150,8 @@ int misc_init_r(void)
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
- CFG_ENV_ADDR_REDUND,
- CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+ CONFIG_ENV_ADDR_REDUND,
+ CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]);
return 0;
@@ -226,12 +226,12 @@ static int restore_default(void)
* Unprotect and erase environment area
*/
flash_protect(FLAG_PROTECT_CLEAR,
- CFG_ENV_ADDR_REDUND,
- CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+ CONFIG_ENV_ADDR_REDUND,
+ CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]);
- flash_sect_erase(CFG_ENV_ADDR_REDUND,
- CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1);
+ flash_sect_erase(CONFIG_ENV_ADDR_REDUND,
+ CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1);
/*
* Now restore default environment from U-Boot image