diff options
author | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
commit | f61f1e150c84f5b9347fca79a4bc5f2286c545d2 (patch) | |
tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /lib_mips/time.c | |
parent | ec081c2c190148b374e86a795fb6b1c49caeb549 (diff) | |
parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
download | u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.zip u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.gz u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.bz2 |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'lib_mips/time.c')
-rw-r--r-- | lib_mips/time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib_mips/time.c b/lib_mips/time.c index 1e92789..07e356d 100644 --- a/lib_mips/time.c +++ b/lib_mips/time.c @@ -27,7 +27,7 @@ static unsigned long timestamp; /* how many counter cycles in a jiffy */ -#define CYCLES_PER_JIFFY (CFG_MIPS_TIMER_FREQ + CFG_HZ / 2) / CFG_HZ +#define CYCLES_PER_JIFFY (CONFIG_SYS_MIPS_TIMER_FREQ + CONFIG_SYS_HZ / 2) / CONFIG_SYS_HZ /* * timer without interrupts @@ -74,7 +74,7 @@ void udelay(unsigned long usec) { unsigned int tmo; - tmo = read_c0_count() + (usec * (CFG_MIPS_TIMER_FREQ / 1000000)); + tmo = read_c0_count() + (usec * (CONFIG_SYS_MIPS_TIMER_FREQ / 1000000)); while ((tmo - read_c0_count()) < 0x7fffffff) /*NOP*/; } @@ -94,5 +94,5 @@ unsigned long long get_ticks(void) */ ulong get_tbclk(void) { - return CFG_HZ; + return CONFIG_SYS_HZ; } |