diff options
author | Tom Rini <trini@konsulko.com> | 2022-03-05 11:34:31 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-03-05 11:34:31 -0500 |
commit | 0444cbbe77ef3583c84086b8e80dc8f86cc80e40 (patch) | |
tree | 6e69554b0f9e3e5c3971da75fe1f10dc6098db10 /arch/arm/mach-k3/am6_init.c | |
parent | 55b5c426ae68ec9c1589960e7e6a8d2a4c399534 (diff) | |
parent | 9b5ad4f5da756939eac4123fc347af533eeb339e (diff) |
Merge branch '2022-03-04-assorted-minor-fixes'
- mailmap file updates, OpenSSL code cleanup, assorted TI platform
fixes, typo fix.
Diffstat (limited to 'arch/arm/mach-k3/am6_init.c')
-rw-r--r-- | arch/arm/mach-k3/am6_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c index ffb7aaded2e..8a6b1de7641 100644 --- a/arch/arm/mach-k3/am6_init.c +++ b/arch/arm/mach-k3/am6_init.c @@ -251,7 +251,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_DRIVER_GET(k3_avs), |