diff options
| author | Lokesh Vutla | 2020-08-05 22:44:14 +0530 |
|---|---|---|
| committer | Lokesh Vutla | 2020-08-11 20:34:46 +0530 |
| commit | b29a7cd09de3d3265d0d72c42d5e1d47bd095e89 (patch) | |
| tree | e023abf621316403c5d3e88c273ff17beeaa4eeb | |
| parent | 6b889389b6700fe56b191be6b4e31b0db7d1652a (diff) | |
board: ti: j721e: Probe eeprom only when CONFIG_TI_I2C_BOARD_DETECT is defined
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>
| -rw-r--r-- | arch/arm/mach-k3/j721e_init.c | 3 | ||||
| -rw-r--r-- | board/ti/j721e/evm.c | 16 |
2 files changed, 13 insertions, 6 deletions
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c index f9454e3273e..5ec62a92f82 100644 --- a/arch/arm/mach-k3/j721e_init.c +++ b/arch/arm/mach-k3/j721e_init.c @@ -208,7 +208,8 @@ void board_init_f(ulong dummy) k3_sysfw_print_ver(); /* 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) ret = uclass_get_device_by_driver(UCLASS_MISC, DM_GET_DRIVER(k3_avs), diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index a1e8fe59c4d..7199d11e95c 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -100,6 +100,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) } #endif +#ifdef CONFIG_TI_I2C_BOARD_DETECT int do_board_detect(void) { int ret; @@ -336,14 +337,17 @@ static int probe_daughtercards(void) return 0; } +#endif int board_late_init(void) { - setup_board_eeprom_env(); - setup_serial(); + if (IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT)) { + setup_board_eeprom_env(); + setup_serial(); - /* Check for and probe any plugged-in daughtercards */ - probe_daughtercards(); + /* Check for and probe any plugged-in daughtercards */ + probe_daughtercards(); + } return 0; } @@ -355,7 +359,9 @@ void spl_board_init(void) int ret; #endif - probe_daughtercards(); + if (IS_ENABLED(CONFIG_TARGET_J721E_A72_EVM) && + IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT)) + probe_daughtercards(); #ifdef CONFIG_ESM_K3 if (board_ti_k3_is("J721EX-PM2-SOM")) { |