summaryrefslogtreecommitdiffstats
path: root/include/configs/zipitz2.h
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2013-11-04 20:50:21 +0100
committerMarek Vasut <marex@denx.de>2013-12-18 20:40:05 +0100
commitf90aea2a65e71a37ff029849d908538ae9e98283 (patch)
tree4b09830b2c216ccbef6c8f3d5e94087e544d2ee8 /include/configs/zipitz2.h
parent914f2bd1f07fba93639ad1273d4cd458b0ee99cc (diff)
downloadtalos-obmc-uboot-f90aea2a65e71a37ff029849d908538ae9e98283.tar.gz
talos-obmc-uboot-f90aea2a65e71a37ff029849d908538ae9e98283.zip
ARM: pxa: Fix CONFIG_SYS_HZ on PXA
The PXA incorrectly uses CONFIG_SYS_HZ, which should be 1000 across U-Boot. Fix this. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Tom Rini <trini@ti.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Diffstat (limited to 'include/configs/zipitz2.h')
-rw-r--r--include/configs/zipitz2.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 52a745e604..904f3b0fb1 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
/*
OpenPOWER on IntegriCloud