summaryrefslogtreecommitdiff
path: root/include/configs/palmtc.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-12-18 22:19:02 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-12-18 22:19:02 +0100
commitd627eefcd5e72db00889718ca9ee1dcb4d026fc9 (patch)
tree92db88f447dcec6b071af2b55182637c0921159e /include/configs/palmtc.h
parentfe7f0810ddf41939bbdd22fe39b0b80fdfe0636b (diff)
parentf90aea2a65e71a37ff029849d908538ae9e98283 (diff)
Merge remote-tracking branch 'u-boot-pxa/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/palmtc.h')
-rw-r--r--include/configs/palmtc.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index 661101ccb6..7303e1c31f 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -118,7 +118,7 @@
* Clock Configuration
*/
#undef CONFIG_SYS_CLKS_IN_HZ
-#define CONFIG_SYS_HZ 3686400 /* Timer @ 3686400 Hz */
+#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_CPUSPEED 0x161 /* 400MHz;L=1 M=3 T=1 */
/*
@@ -156,10 +156,10 @@
#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
#define CONFIG_ENV_IS_IN_FLASH 1