diff options
author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:48:09 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:48:09 +0200 |
commit | 1a5017601f6d17caedaa2bf069485d3e4155f1c0 (patch) | |
tree | 342b39d2a55eb4ebaf8b772bc8b74db4318d5eb7 /include/configs/dbau1x00.h | |
parent | cdeb62e20d94005f2e80604fda03b498c3a6f704 (diff) | |
parent | 79b51ff8205f0354d5300570614c1d2db499679c (diff) | |
download | u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.zip u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.tar.gz u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-mips
Diffstat (limited to 'include/configs/dbau1x00.h')
-rw-r--r-- | include/configs/dbau1x00.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index b2f606f..0e10396 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -30,21 +30,21 @@ #define CONFIG_MIPS32 1 /* MIPS32 CPU core */ #define CONFIG_DBAU1X00 1 -#define CONFIG_AU1X00 1 /* alchemy series cpu */ +#define CONFIG_SOC_AU1X00 1 /* alchemy series cpu */ #ifdef CONFIG_DBAU1000 /* Also known as Merlot */ -#define CONFIG_AU1000 1 +#define CONFIG_SOC_AU1000 1 #else #ifdef CONFIG_DBAU1100 -#define CONFIG_AU1100 1 +#define CONFIG_SOC_AU1100 1 #else #ifdef CONFIG_DBAU1500 -#define CONFIG_AU1500 1 +#define CONFIG_SOC_AU1500 1 #else #ifdef CONFIG_DBAU1550 /* Cabernet */ -#define CONFIG_AU1550 1 +#define CONFIG_SOC_AU1550 1 #else #error "No valid board set" #endif @@ -148,7 +148,9 @@ #error "Invalid CPU frequency - must be multiple of 12!" #endif -#define CFG_HZ (CFG_MHZ * 1000000) /* FIXME causes overflow in net.c */ +#define CFG_MIPS_TIMER_FREQ (CFG_MHZ * 1000000) + +#define CFG_HZ 1000 #define CFG_SDRAM_BASE 0x80000000 /* Cached addr */ |