diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-18 22:19:02 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-18 22:19:02 +0100 |
| commit | d627eefcd5e72db00889718ca9ee1dcb4d026fc9 (patch) | |
| tree | 92db88f447dcec6b071af2b55182637c0921159e /include/configs/zipitz2.h | |
| parent | fe7f0810ddf41939bbdd22fe39b0b80fdfe0636b (diff) | |
| parent | f90aea2a65e71a37ff029849d908538ae9e98283 (diff) | |
| download | u-boot-imx-d627eefcd5e72db00889718ca9ee1dcb4d026fc9.zip u-boot-imx-d627eefcd5e72db00889718ca9ee1dcb4d026fc9.tar.gz u-boot-imx-d627eefcd5e72db00889718ca9ee1dcb4d026fc9.tar.bz2 | |
Merge remote-tracking branch 'u-boot-pxa/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/zipitz2.h')
| -rw-r--r-- | include/configs/zipitz2.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 52a745e..904f3b0 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -139,7 +139,7 @@ unsigned char zipitz2_spi_read(void); * Clock Configuration */ #undef CONFIG_SYS_CLKS_IN_HZ -#define CONFIG_SYS_HZ 3250000 /* Timer @ 3250000 Hz */ +#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CPUSPEED 0x190 /* standard setting for 312MHz; L=16, N=1.5, A=0, SDCLK!=SystemBus */ /* @@ -186,10 +186,10 @@ unsigned char zipitz2_spi_read(void); #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_LOCK_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_UNLOCK_TOUT (2*CONFIG_SYS_HZ) +#define CONFIG_SYS_FLASH_ERASE_TOUT 240000 +#define CONFIG_SYS_FLASH_WRITE_TOUT 240000 +#define CONFIG_SYS_FLASH_LOCK_TOUT 240000 +#define CONFIG_SYS_FLASH_UNLOCK_TOUT 240000 #define CONFIG_SYS_FLASH_PROTECTION /* |