Merge with /home/sr/git/u-boot/denx

diff --git a/CHANGELOG b/CHANGELOG
index facc6c297c011e4a11a645fc1fd5c02c243c0e6f..b79ffbe9cf656dd6a5eb480ca3047bc0dd6b2a53 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix examples/Makefile; some build targets were lost
+  
+* 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
   We use the "automatic" mode that was used for  the  MPC8266ADS  and
   MPC8272 boards. Eventually this should be used on all boards?]

diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c
index 37172379b9875ed3628092d4b894f7aa402c979a..fd0a186828d4be171f6cfeb11e95133de214245d 100644 (file)
--- 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");
 }

diff --git a/examples/Makefile b/examples/Makefile
index b198048973e84ab9f9e1f6f82e048136cda05864..fee26741d07d08cee78d7fa84dc083f7dfe3ba25 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -122,7 +122,7 @@ clibdir := $(shell dirname `$(CC) $(CFLAGS) -print-file-name=libc.a`)
 
 CPPFLAGS += -I..
 
-all:   .depend $(OBJS) $(LIB) #$(SREC) $(BIN)
+all:   .depend $(OBJS) $(LIB) $(SREC) $(BIN)
 
 #########################################################################
 $(LIB): .depend $(LIBOBJS)