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
/
prodrive
/
pdnb3
/
flash.c
diff --git
a/board/prodrive/pdnb3/flash.c
b/board/prodrive/pdnb3/flash.c
index
518ea9c
..
5738c5b
100644
(file)
--- a/
board/prodrive/pdnb3/flash.c
+++ b/
board/prodrive/pdnb3/flash.c
@@
-24,7
+24,7
@@
#include <common.h>
#include <asm/arch/ixp425.h>
#include <common.h>
#include <asm/arch/ixp425.h>
-#if !defined(C
F
G_FLASH_CFI_DRIVER)
+#if !defined(C
ONFI
G_FLASH_CFI_DRIVER)
/*
* include common flash code (for esd boards)
/*
* include common flash code (for esd boards)
@@
-71,14
+71,14
@@
unsigned long flash_init(void)
/* Environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
/* Environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
flash_info[0].size = size;
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
flash_info[0].size = size;
@@
-86,4
+86,4
@@
unsigned long flash_init(void)
return size;
}
return size;
}
-#endif /* C
F
G_FLASH_CFI_DRIVER */
+#endif /* C
ONFI
G_FLASH_CFI_DRIVER */