diff options
Diffstat (limited to 'board/ti')
| -rw-r--r-- | board/ti/am335x/board.c | 13 | ||||
| -rw-r--r-- | board/ti/ti814x/evm.c | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 2be2297..a6edc2d 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -317,10 +317,7 @@ void s_init(void) #if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT) /* Setup the PLLs and the clocks for the peripherals */ - pll_init(); - - /* Enable RTC32K clock */ - rtc32k_enable(); + setup_clocks_for_console(); #ifdef CONFIG_SERIAL1 enable_uart0_pin_mux(); @@ -354,12 +351,14 @@ void s_init(void) preloader_console_init(); #endif - /* Initalize the board header */ - enable_i2c0_pin_mux(); - i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); + prcm_init(); + if (read_eeprom(&header) < 0) puts("Could not get board ID.\n"); + /* Enable RTC32K clock */ + rtc32k_enable(); + enable_board_pin_mux(&header); if (board_is_evm_sk(&header)) { /* diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c index c469645..bd708bb 100644 --- a/board/ti/ti814x/evm.c +++ b/board/ti/ti814x/evm.c @@ -125,11 +125,7 @@ void s_init(void) /* Enable timer */ timer_init(); - /* Setup the PLLs and the clocks for the peripherals */ - pll_init(); - - /* Enable RTC32K clock */ - rtc32k_enable(); + setup_clocks_for_console(); /* Set UART pins */ enable_uart0_pin_mux(); @@ -147,6 +143,12 @@ void s_init(void) preloader_console_init(); + /* Setup the PLLs and the clocks for the peripherals */ + prcm_init(); + + /* Enable RTC32K clock */ + rtc32k_enable(); + config_dmm(&evm_lisa_map_regs); config_ddr(0, 0, &evm_ddr2_data, &evm_ddr2_cctrl_data, |