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
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
board
/
Marvell
/
common
/
intel_flash.c
diff --git
a/board/Marvell/common/intel_flash.c
b/board/Marvell/common/intel_flash.c
index
d26f883
..
42b3ee1
100644
(file)
--- a/
board/Marvell/common/intel_flash.c
+++ b/
board/Marvell/common/intel_flash.c
@@
-152,7
+152,7
@@
int write_word_intel (bank_addr_t addr, bank_word_t value)
/* data polling for D7 */
start = get_timer (0);
do {
/* data polling for D7 */
start = get_timer (0);
do {
- if (get_timer (start) > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer (start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
retval = 1;
goto done;
}
retval = 1;
goto done;
}
@@
-227,7
+227,7
@@
int flash_erase_intel (flash_info_t * info, int s_first, int s_last)
do {
now = get_timer (start);
do {
now = get_timer (start);
- if (now - estart > C
FG
_FLASH_ERASE_TOUT) {
+ if (now - estart > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
printf ("Timeout (sect %d)\n", sect);
haderr = 1;
break;
printf ("Timeout (sect %d)\n", sect);
haderr = 1;
break;