mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
am33xx: Do not call init_timer twice
We do not need to call init_timer both in SPL and U-Boot itself, just SPL needs to initialize the timer. Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
parent
d1df0fd373
commit
2ab2810375
3 changed files with 17 additions and 28 deletions
|
@ -40,6 +40,22 @@ struct uart_sys *uart_base = (struct uart_sys *)DEFAULT_UART_BASE;
|
|||
#define UART_SMART_IDLE_EN (0x1 << 0x3)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
/* Initialize timer */
|
||||
static void init_timer(void)
|
||||
{
|
||||
/* Reset the Timer */
|
||||
writel(0x2, (&timer_base->tscir));
|
||||
|
||||
/* Wait until the reset is done */
|
||||
while (readl(&timer_base->tiocp_cfg) & 1)
|
||||
;
|
||||
|
||||
/* Start the Timer */
|
||||
writel(0x1, (&timer_base->tclr));
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* early system init of muxing and clocks.
|
||||
*/
|
||||
|
@ -88,20 +104,6 @@ void s_init(void)
|
|||
enable_mmc0_pin_mux();
|
||||
}
|
||||
|
||||
/* Initialize timer */
|
||||
void init_timer(void)
|
||||
{
|
||||
/* Reset the Timer */
|
||||
writel(0x2, (&timer_base->tscir));
|
||||
|
||||
/* Wait until the reset is done */
|
||||
while (readl(&timer_base->tiocp_cfg) & 1)
|
||||
;
|
||||
|
||||
/* Start the Timer */
|
||||
writel(0x1, (&timer_base->tclr));
|
||||
}
|
||||
|
||||
#if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD)
|
||||
int board_mmc_init(bd_t *bis)
|
||||
{
|
||||
|
|
|
@ -213,8 +213,6 @@ struct ctrl_stat {
|
|||
unsigned int resv1[16];
|
||||
unsigned int statusreg; /* ofset 0x40 */
|
||||
};
|
||||
|
||||
void init_timer(void);
|
||||
#endif /* __ASSEMBLY__ */
|
||||
#endif /* __KERNEL_STRICT_NAMES */
|
||||
|
||||
|
|
|
@ -29,17 +29,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
/*
|
||||
* Basic board specific setup
|
||||
*/
|
||||
int init_basic_setup(void)
|
||||
{
|
||||
/* Initialize the Timer */
|
||||
init_timer();
|
||||
|
||||
/* address of boot parameters */
|
||||
gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
enable_uart0_pin_mux();
|
||||
|
@ -49,7 +38,7 @@ int board_init(void)
|
|||
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
|
||||
#endif
|
||||
|
||||
init_basic_setup();
|
||||
gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue