diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-12 23:56:33 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-12 23:56:33 +0200 |
| commit | df4a0796e86662536df2387ddcf969c2a704bcc2 (patch) | |
| tree | dc8835b75a1a2990db79ebf493e50b3451afd3d9 /include | |
| parent | 1e841086df55d6b8f2efcf0e5dfb5fc52a0c7bbe (diff) | |
| parent | 22a871a4644d3c7f6aa1ef77ae969d775752f6fa (diff) | |
| download | talos-obmc-uboot-df4a0796e86662536df2387ddcf969c2a704bcc2.tar.gz talos-obmc-uboot-df4a0796e86662536df2387ddcf969c2a704bcc2.zip | |
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.h | 4 | ||||
| -rw-r--r-- | include/configs/imx31_phycore.h | 2 | ||||
| -rw-r--r-- | include/configs/mx31ads.h | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index 60916b9077..9a655aa625 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 bf2a8dd4bb..15402030af 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 b904d814da..04790fd926 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 |
