diff options
Diffstat (limited to 'drivers/cfi_flash.c')
| -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 37172379b..fd0a18682 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");  } |