summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-10-12 23:56:33 +0200
committerWolfgang Denk <wd@denx.de>2008-10-12 23:56:33 +0200
commitdf4a0796e86662536df2387ddcf969c2a704bcc2 (patch)
treedc8835b75a1a2990db79ebf493e50b3451afd3d9 /include
parent1e841086df55d6b8f2efcf0e5dfb5fc52a0c7bbe (diff)
parent22a871a4644d3c7f6aa1ef77ae969d775752f6fa (diff)
downloadu-boot-imx-df4a0796e86662536df2387ddcf969c2a704bcc2.zip
u-boot-imx-df4a0796e86662536df2387ddcf969c2a704bcc2.tar.gz
u-boot-imx-df4a0796e86662536df2387ddcf969c2a704bcc2.tar.bz2
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'include')
-rw-r--r--include/configs/imx31_litekit.h4
-rw-r--r--include/configs/imx31_phycore.h2
-rw-r--r--include/configs/mx31ads.h4
3 files changed, 3 insertions, 7 deletions
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 60916b9..9a655aa 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -122,11 +122,9 @@
#define CFG_MEMTEST_START 0 /* memtest works on */
#define CFG_MEMTEST_END 0x10000
-#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */
-
#define CFG_LOAD_ADDR 0 /* default load address */
-#define CFG_HZ 32000
+#define CFG_HZ 1000
#define CONFIG_CMDLINE_EDITING 1
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index bf2a8dd..1540203 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -126,7 +126,7 @@
#define CFG_LOAD_ADDR 0 /* default load address */
-#define CFG_HZ 32000
+#define CFG_HZ 1000
#define CONFIG_CMDLINE_EDITING 1
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index b904d81..04790fd 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -139,11 +139,9 @@
#define CFG_MEMTEST_START 0 /* memtest works on */
#define CFG_MEMTEST_END 0x10000
-#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */
-
#define CFG_LOAD_ADDR CONFIG_LOADADDR
-#define CFG_HZ CONFIG_MX31_CLK32 /* use 32kHz clock as source */
+#define CFG_HZ 1000
#define CONFIG_CMDLINE_EDITING 1