diff options
| author | Wolfgang Denk <wd@denx.de> | 2006-06-14 17:52:00 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-14 17:52:00 +0200 |
| commit | 007d67da94db86989c3d0ad0a9728391b7eed02b (patch) | |
| tree | b24a2708448b83ef0b372c1e3502b7908f54d283 /drivers | |
| parent | 16c8d5e76ae0f78f39a60608574adfe0feb9cc70 (diff) | |
| parent | df02bd1b3f2eecca04bfecb62eae7c2ff698506a (diff) | |
| download | blackbird-obmc-uboot-007d67da94db86989c3d0ad0a9728391b7eed02b.tar.gz blackbird-obmc-uboot-007d67da94db86989c3d0ad0a9728391b7eed02b.zip | |
Merge with /home/wd/git/u-boot/master
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 37172379b9..fd0a186828 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"); } |
