提交 70e2aaf3 编写于 作者: S Simon Glass 提交者: Tom Rini

board_f: powerpc: Use timer_init() instead of init_timebase()

There is no good reason to use a different name on PowerPC. Change it to
timer_init() like the others.
Signed-off-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NYork Sun <york.sun@nxp.com>
Reviewed-by: NStefan Roese <sr@denx.de>
上级 1793e782
...@@ -43,7 +43,7 @@ void cpu_init_f (volatile immap_t * immr) ...@@ -43,7 +43,7 @@ void cpu_init_f (volatile immap_t * immr)
immr->im_uimb.uimb_umcr = CONFIG_SYS_UMCR; immr->im_uimb.uimb_umcr = CONFIG_SYS_UMCR;
/* Time base and decrementer will be enables (TBE) */ /* Time base and decrementer will be enables (TBE) */
/* in init_timebase() in time.c called from board_init_f(). */ /* in timer_init() in time.c called from board_init_f(). */
/* Initialize the PIT. Unlock PISCRK */ /* Initialize the PIT. Unlock PISCRK */
immr->im_sitk.sitk_piscrk = KAPWR_KEY; immr->im_sitk.sitk_piscrk = KAPWR_KEY;
......
...@@ -60,7 +60,7 @@ unsigned long ticks2usec(unsigned long ticks) ...@@ -60,7 +60,7 @@ unsigned long ticks2usec(unsigned long ticks)
#endif #endif
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
int init_timebase (void) int timer_init(void)
{ {
unsigned long temp; unsigned long temp;
......
...@@ -133,7 +133,7 @@ void board_init_f(ulong bootflag) ...@@ -133,7 +133,7 @@ void board_init_f(ulong bootflag)
NS16550_init((NS16550_t)(CONFIG_SYS_IMMR + 0x4500), NS16550_init((NS16550_t)(CONFIG_SYS_IMMR + 0x4500),
CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
puts("NAND boot... "); puts("NAND boot... ");
init_timebase(); timer_init();
initdram(0); initdram(0);
relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC_SP, (gd_t *)gd, relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC_SP, (gd_t *)gd,
CONFIG_SYS_NAND_U_BOOT_RELOC); CONFIG_SYS_NAND_U_BOOT_RELOC);
......
...@@ -221,7 +221,7 @@ void board_init_f(ulong bootflag) ...@@ -221,7 +221,7 @@ void board_init_f(ulong bootflag)
NS16550_init((NS16550_t)(CONFIG_SYS_IMMR + 0x4500), NS16550_init((NS16550_t)(CONFIG_SYS_IMMR + 0x4500),
CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
puts("NAND boot... "); puts("NAND boot... ");
init_timebase(); timer_init();
initdram(0); initdram(0);
relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000, (gd_t *)gd, relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000, (gd_t *)gd,
CONFIG_SYS_NAND_U_BOOT_RELOC); CONFIG_SYS_NAND_U_BOOT_RELOC);
......
...@@ -831,10 +831,8 @@ static const init_fnc_t init_sequence_f[] = { ...@@ -831,10 +831,8 @@ static const init_fnc_t init_sequence_f[] = {
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
/* get CPU and bus clocks according to the environment variable */ /* get CPU and bus clocks according to the environment variable */
get_clocks, /* get CPU and bus clocks (etc.) */ get_clocks, /* get CPU and bus clocks (etc.) */
/* TODO: can we rename this to timer_init()? */
init_timebase,
#endif #endif
#if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \ #if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
defined(CONFIG_NDS32) || defined(CONFIG_SH) defined(CONFIG_NDS32) || defined(CONFIG_SH)
timer_init, /* initialize timer */ timer_init, /* initialize timer */
#endif #endif
......
...@@ -780,7 +780,6 @@ void wait_ticks (unsigned long); ...@@ -780,7 +780,6 @@ void wait_ticks (unsigned long);
/* arch/$(ARCH)/lib/time.c */ /* arch/$(ARCH)/lib/time.c */
ulong usec2ticks (unsigned long usec); ulong usec2ticks (unsigned long usec);
ulong ticks2usec (unsigned long ticks); ulong ticks2usec (unsigned long ticks);
int init_timebase (void);
/* lib/gunzip.c */ /* lib/gunzip.c */
int gunzip(void *, int, unsigned char *, unsigned long *); int gunzip(void *, int, unsigned char *, unsigned long *);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册