V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix watchdog handling in CFI flash driver 

Just use udelay() when waiting for status changes which will
implicitely trigger the watchdog.
This commit is contained in:
Wolfgang Denk 2006-06-02 11:46:20 +02:00
parent 392c252efd
commit 62b8f54877
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -2,6 +2,10 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Fix watchdog handling in CFI flash driver
Just use udelay() when waiting for status changes which will
implicitely trigger the watchdog.
* Fix PCI to memory window size problems on PM82x boards * Fix PCI to memory window size problems on PM82x boards
We use the "automatic" mode that was used for the MPC8266ADS and We use the "automatic" mode that was used for the MPC8266ADS and
MPC8272 boards. Eventually this should be used on all boards?] MPC8272 boards. Eventually this should be used on all boards?]

6
drivers/cfi_flash.c
View File

@ -45,7 +45,6 @@
/* #define DEBUG */ /* #define DEBUG */
#include <common.h> #include <common.h>
#include <watchdog.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <environment.h> #include <environment.h>
@ -794,6 +793,7 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector,
flash_write_cmd (info, sector, 0, info->cmd_reset); flash_write_cmd (info, sector, 0, info->cmd_reset);
return ERR_TIMOUT; return ERR_TIMOUT;
} }
udelay (1); /* also triggers watchdog */
} }
return ERR_OK; return ERR_OK;
} }
@ -1308,10 +1308,6 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest,
if (flag) if (flag)
enable_interrupts (); enable_interrupts ();
#if defined(CONFIG_MCF52x2)
WATCHDOG_RESET();
#endif
return flash_full_status_check (info, find_sector (info, dest), return flash_full_status_check (info, find_sector (info, dest),
info->write_tout, "write"); info->write_tout, "write");
} }