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
Convert CONFIG_SYS_FLASH_ERASE_TOUT et al to Kconfig
[platform/kernel/u-boot.git]
/
board
/
cobra5272
/
flash.c
diff --git
a/board/cobra5272/flash.c
b/board/cobra5272/flash.c
index
4337f48
..
5d15ed4
100644
(file)
--- a/
board/cobra5272/flash.c
+++ b/
board/cobra5272/flash.c
@@
-200,8
+200,8
@@
int flash_erase(flash_info_t *info, int s_first, int s_last)
do {
result = *addr;
do {
result = *addr;
- /* check timeout */
- if (get_timer(start) >
CONFIG_SYS_FLASH_ERASE_TOUT
) {
+ /* check timeout
, 1000ms
*/
+ if (get_timer(start) >
1000
) {
MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
chip1 = TMO;
break;
MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
chip1 = TMO;
break;
@@
-289,8
+289,8
@@
static int write_word(flash_info_t *info, ulong dest, ulong data)
do {
result = *addr;
do {
result = *addr;
- /* check timeout */
- if (get_timer(start) >
CONFIG_SYS_FLASH_ERASE_TOUT
) {
+ /* check timeout
, 1000ms
*/
+ if (get_timer(start) >
1000
) {
chip1 = ERR | TMO;
break;
}
chip1 = ERR | TMO;
break;
}