mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-26 04:17:09 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
This commit is contained in:
commit
4284f36a3e
1 changed files with 4 additions and 1 deletions
|
@ -537,7 +537,10 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector,
|
|||
ulong start;
|
||||
|
||||
#if CONFIG_SYS_HZ != 1000
|
||||
tout *= CONFIG_SYS_HZ/1000;
|
||||
if ((ulong)CONFIG_SYS_HZ > 100000)
|
||||
tout *= (ulong)CONFIG_SYS_HZ / 1000; /* for a big HZ, avoid overflow */
|
||||
else
|
||||
tout = DIV_ROUND_UP(tout * (ulong)CONFIG_SYS_HZ, 1000);
|
||||
#endif
|
||||
|
||||
/* Wait for command completion */
|
||||
|
|
Loading…
Add table
Reference in a new issue