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 'master' of /home/wd/git/u-boot/custodians
[platform/kernel/u-boot.git]
/
board
/
netstal
/
hcu5
/
hcu5.c
diff --git
a/board/netstal/hcu5/hcu5.c
b/board/netstal/hcu5/hcu5.c
index
4ecdb25
..
f3428c2
100644
(file)
--- a/
board/netstal/hcu5/hcu5.c
+++ b/
board/netstal/hcu5/hcu5.c
@@
-240,18
+240,18
@@
int misc_init_r(void)
unsigned long usb2phy0cr, usb2h0cr = 0;
unsigned long sdr0_pfc1;
unsigned long usb2phy0cr, usb2h0cr = 0;
unsigned long sdr0_pfc1;
-#ifdef C
F
G_ENV_IS_IN_FLASH
+#ifdef C
ONFI
G_ENV_IS_IN_FLASH
/* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN,
0xffffffff,
&flash_info[0]);
/* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN,
0xffffffff,
&flash_info[0]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
/* 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]);
#endif
#endif
&flash_info[0]);
#endif
#endif