Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

board: ti: j721e: Probe eeprom only when CONFIG_TI_I2C_BOARD_DETECT is defined

Browse source 
Guard all eeprom probe with TI_I2C_BOARD_DETECT to avoid reading eeprom
when eeprom is not available

Reviewed-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
This commit is contained in:
Lokesh Vutla 2020-08-05 22:44:14 +05:30
parent 6b889389b6
commit b29a7cd09d
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-k3/j721e_init.c
View file

@ -208,7 +208,8 @@ void board_init_f(ulong dummy)
k3_sysfw_print_ver(); k3_sysfw_print_ver();
/* Perform EEPROM-based board detection */ /* Perform EEPROM-based board detection */
do_board_detect(); if (IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT))
do_board_detect();
#if defined(CONFIG_CPU_V7R) && defined(CONFIG_K3_AVS0) #if defined(CONFIG_CPU_V7R) && defined(CONFIG_K3_AVS0)
ret = uclass_get_device_by_driver(UCLASS_MISC, DM_GET_DRIVER(k3_avs), ret = uclass_get_device_by_driver(UCLASS_MISC, DM_GET_DRIVER(k3_avs),

16
board/ti/j721e/evm.c
View file

@ -100,6 +100,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
} }
#endif #endif
#ifdef CONFIG_TI_I2C_BOARD_DETECT
int do_board_detect(void) int do_board_detect(void)
{ {
int ret; int ret;
@ -336,14 +337,17 @@ static int probe_daughtercards(void)
return 0; return 0;
} }
#endif
int board_late_init(void) int board_late_init(void)
{ {
setup_board_eeprom_env(); if (IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT)) {
setup_serial(); setup_board_eeprom_env();
setup_serial();
/* Check for and probe any plugged-in daughtercards */ /* Check for and probe any plugged-in daughtercards */
probe_daughtercards(); probe_daughtercards();
}
return 0; return 0;
} }
@ -355,7 +359,9 @@ void spl_board_init(void)
int ret; int ret;
#endif #endif
probe_daughtercards(); if (IS_ENABLED(CONFIG_TARGET_J721E_A72_EVM) &&
IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT))
probe_daughtercards();
#ifdef CONFIG_ESM_K3 #ifdef CONFIG_ESM_K3
if (board_ti_k3_is("J721EX-PM2-SOM")) { if (board_ti_k3_is("J721EX-PM2-SOM")) {