arm: mach-k3: am6_init: Use CONFIG_TI_I2C_BOARD_DETECT

We only want to call do_board_detect() if CONFIG_TI_I2C_BOARD_DETECT
is set. Same as done for am64.

This makes it possible to add a custom am65 based board design to
U-Boot that does not use this board detection mechanism.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>

diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index ffb7aaded2e731be97e2a906bbe6c04432d5df51..8a6b1de76410d604237d45960dbcdee9da4327fd 100644 (file)
--- 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),

diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index fbe33cbea55183ec8102b8681ed2c46518076f72..7182a8cad1a48956a98db84eccb1139c8dd3c1af 100644 (file)
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -129,6 +129,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;
@@ -353,23 +354,26 @@ static int probe_daughtercards(void)
 
        return 0;
 }
+#endif
 
 int board_late_init(void)
 {
-       struct ti_am6_eeprom *ep = TI_AM6_EEPROM_DATA;
+       if (IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT)) {
+               struct ti_am6_eeprom *ep = TI_AM6_EEPROM_DATA;
 
-       setup_board_eeprom_env();
+               setup_board_eeprom_env();
 
-       /*
-        * The first MAC address for ethernet a.k.a. ethernet0 comes from
-        * efuse populated via the am654 gigabit eth switch subsystem driver.
-        * All the other ones are populated via EEPROM, hence continue with
-        * an index of 1.
-        */
-       board_ti_am6_set_ethaddr(1, ep->mac_addr_cnt);
+               /*
+                * The first MAC address for ethernet a.k.a. ethernet0 comes from
+                * efuse populated via the am654 gigabit eth switch subsystem driver.
+                * All the other ones are populated via EEPROM, hence continue with
+                * an index of 1.
+                */
+               board_ti_am6_set_ethaddr(1, ep->mac_addr_cnt);
 
-       /* Check for and probe any plugged-in daughtercards */
-       probe_daughtercards();
+               /* Check for and probe any plugged-in daughtercards */
+               probe_daughtercards();
+       }
 
        return 0;
 }