projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
board
/
zeus
/
zeus.c
diff --git
a/board/zeus/zeus.c
b/board/zeus/zeus.c
index
2a4ec5c
..
6fa4eef
100644
(file)
--- 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,
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
return 0;
&flash_info[0]);
return 0;
@@
-226,12
+226,12
@@
static int restore_default(void)
* Unprotect and erase environment area
*/
flash_protect(FLAG_PROTECT_CLEAR,
* Unprotect and erase environment area
*/
flash_protect(FLAG_PROTECT_CLEAR,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
&flash_info[0]);
- flash_sect_erase(C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1);
+ flash_sect_erase(C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1);
/*
* Now restore default environment from U-Boot image
/*
* Now restore default environment from U-Boot image