diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-06-07 08:49:38 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-06-07 08:49:38 -0500 |
| commit | 72ed528a948b151e7be5ce03ed3d2b88a229dd0a (patch) | |
| tree | 0f90590c0faf6fcc85f26f92facc653112be53e0 /drivers | |
| parent | 9f37dc8cabc94aed27aec8b4c69a390c8603fd28 (diff) | |
| parent | e461a24113c66747510b07930a83b0d84171a559 (diff) | |
| download | u-boot-imx-72ed528a948b151e7be5ce03ed3d2b88a229dd0a.zip u-boot-imx-72ed528a948b151e7be5ce03ed3d2b88a229dd0a.tar.gz u-boot-imx-72ed528a948b151e7be5ce03ed3d2b88a229dd0a.tar.bz2 | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cfi_flash.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c index 3717237..fd0a186 100644 --- a/drivers/cfi_flash.c +++ b/drivers/cfi_flash.c @@ -45,7 +45,6 @@ /* #define DEBUG */ #include <common.h> -#include <watchdog.h> #include <asm/processor.h> #include <asm/byteorder.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); return ERR_TIMOUT; } + udelay (1); /* also triggers watchdog */ } return ERR_OK; } @@ -1308,10 +1308,6 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest, if (flag) enable_interrupts (); -#if defined(CONFIG_MCF52x2) - WATCHDOG_RESET(); -#endif - return flash_full_status_check (info, find_sector (info, dest), info->write_tout, "write"); } |