Merge branch 'master' of /home/wd/git/u-boot/master

[karo-tx-uboot.git] / drivers / mtd / cfi_flash.c

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index d0240f55d4996fe8148b9950dd2eb47ca85b845d..2d09caf73877998fc194bb6934adaa5de57a665b 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -544,6 +544,7 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector,
 #endif
 
        /* Wait for command completion */
+       reset_timer();
        start = get_timer (0);
        while (flash_is_busy (info, sector)) {
                if (get_timer (start) > tout) {
@@ -630,6 +631,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,
 #endif
 
        /* Wait for command completion */
+       reset_timer();
        start = get_timer(0);
        while (1) {
                switch (info->portwidth) {
@@ -1991,7 +1993,7 @@ unsigned long flash_init (void)
 #ifdef CONFIG_SYS_FLASH_PROTECTION
        /* read environment from EEPROM */
        char s[64];
-       getenv_r ("unlock", s, sizeof(s));
+       getenv_f("unlock", s, sizeof(s));
 #endif
 
 #define BANK_BASE(i)   (((phys_addr_t [CFI_MAX_FLASH_BANKS])CONFIG_SYS_FLASH_BANKS_LIST)[i])