diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-30 22:45:55 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-30 22:45:55 +0200 |
| commit | aeabdeb7a33c9cff9ae0cd804521d0d691a7c341 (patch) | |
| tree | 2979428a02f5eebf256d18a3fb5839e063c3354a /arch/powerpc/cpu/mpc85xx/cpu.c | |
| parent | f3c615b8abc098f5222b061b81c75f1363ff4d32 (diff) | |
| parent | a2879634c430df3d308f4a3badb37cddca0328f5 (diff) | |
| download | olio-uboot-2014.01-aeabdeb7a33c9cff9ae0cd804521d0d691a7c341.tar.xz olio-uboot-2014.01-aeabdeb7a33c9cff9ae0cd804521d0d691a7c341.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index f5b39c067..f863f4aad 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -234,13 +234,14 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* * Get timebase clock frequency */ +#ifndef CONFIG_SYS_FSL_TBCLK_DIV +#define CONFIG_SYS_FSL_TBCLK_DIV 8 +#endif unsigned long get_tbclk (void) { -#ifdef CONFIG_FSL_CORENET - return (gd->bus_clk + 8) / 16; -#else - return (gd->bus_clk + 4UL)/8UL; -#endif + unsigned long tbclk_div = CONFIG_SYS_FSL_TBCLK_DIV; + + return (gd->bus_clk + (tbclk_div >> 1)) / tbclk_div; } |