X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fcfi_flash.c;h=fd0a186828d4be171f6cfeb11e95133de214245d;hb=681fc61c4cd3b2ef1fdd67224be8c4387fe533fd;hp=37172379b9875ed3628092d4b894f7aa402c979a;hpb=eaa1fa16c4a235ff59f3a2c19904ce41468101d1;p=u-boot

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");
 }