mirror of
https://github.com/u-boot/u-boot.git
synced 2025-05-03 10:17:21 +00:00
freescale: Drop call to init_func_vid() in the init sequence
Use the misc_init_f event instead, which is designed for this purpose. All boards with CONFIG_VID already enable CONFIG_EVENT. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
13a7db9ab1
commit
6a32bfae61
5 changed files with 9 additions and 14 deletions
|
@ -78,6 +78,11 @@ void tzpc_init(void)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__weak int init_func_vid(void)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
void board_init_f(ulong dummy)
|
void board_init_f(ulong dummy)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
|
@ -181,13 +181,14 @@ unsigned long long get_qixis_addr(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_VID)
|
#if defined(CONFIG_VID)
|
||||||
int init_func_vid(void)
|
static int setup_core_voltage(void)
|
||||||
{
|
{
|
||||||
if (adjust_vdd(0) < 0)
|
if (adjust_vdd(0) < 0)
|
||||||
printf("core voltage not adjusted\n");
|
printf("core voltage not adjusted\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
EVENT_SPY_SIMPLE(EVT_MISC_INIT_F, setup_core_voltage);
|
||||||
|
|
||||||
u16 soc_get_fuse_vid(int vid_index)
|
u16 soc_get_fuse_vid(int vid_index)
|
||||||
{
|
{
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include <i2c.h>
|
#include <i2c.h>
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <event.h>
|
||||||
#include <netdev.h>
|
#include <netdev.h>
|
||||||
#include <fsl_ddr.h>
|
#include <fsl_ddr.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
@ -242,6 +243,7 @@ int init_func_vid(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
EVENT_SPY_SIMPLE(EVT_MISC_INIT_F, init_func_vid);
|
||||||
|
|
||||||
int checkboard(void)
|
int checkboard(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -280,13 +280,6 @@ static int init_func_i2c(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_VID)
|
|
||||||
__weak int init_func_vid(void)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int setup_mon_len(void)
|
static int setup_mon_len(void)
|
||||||
{
|
{
|
||||||
#if defined(__ARM__) || defined(__MICROBLAZE__)
|
#if defined(__ARM__) || defined(__MICROBLAZE__)
|
||||||
|
@ -896,9 +889,6 @@ static const init_fnc_t init_sequence_f[] = {
|
||||||
INIT_FUNC_WATCHDOG_RESET
|
INIT_FUNC_WATCHDOG_RESET
|
||||||
#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
|
#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
|
||||||
init_func_i2c,
|
init_func_i2c,
|
||||||
#endif
|
|
||||||
#if defined(CONFIG_VID) && !defined(CONFIG_SPL)
|
|
||||||
init_func_vid,
|
|
||||||
#endif
|
#endif
|
||||||
announce_dram_init,
|
announce_dram_init,
|
||||||
dram_init, /* configure available RAM banks */
|
dram_init, /* configure available RAM banks */
|
||||||
|
|
|
@ -276,9 +276,6 @@ int set_cpu_clk_info(void);
|
||||||
int update_flash_size(int flash_size);
|
int update_flash_size(int flash_size);
|
||||||
int arch_early_init_r(void);
|
int arch_early_init_r(void);
|
||||||
int misc_init_r(void);
|
int misc_init_r(void);
|
||||||
#if defined(CONFIG_VID)
|
|
||||||
int init_func_vid(void);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* common/board_info.c */
|
/* common/board_info.c */
|
||||||
int checkboard(void);
|
int checkboard(void);
|
||||||
|
|
Loading…
Add table
Reference in a new issue