From: Lokesh Vutla <lokeshvutla@ti.com>
Date: Thu, 6 May 2021 11:14:52 +0000 (+0530)
Subject: arm: am64x: Add support for selecting DT based on EEPROM
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=b5425a96764e423c99dcd50e4f28a1834a5d4803;p=u-boot.git

arm: am64x: Add support for selecting DT based on EEPROM

Enable support for selecting DTB within SPL based on EEPROM.
This will help to use single defconfig for both EVM and SK

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---

diff --git a/arch/arm/mach-k3/am642_init.c b/arch/arm/mach-k3/am642_init.c
index 2a38b843d9..885f181d58 100644
--- a/arch/arm/mach-k3/am642_init.c
+++ b/arch/arm/mach-k3/am642_init.c
@@ -20,6 +20,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/pinctrl.h>
 #include <mmc.h>
+#include <dm/root.h>
 
 #if defined(CONFIG_SPL_BUILD)
 
@@ -82,6 +83,29 @@ void k3_mmc_stop_clock(void) {}
 void k3_mmc_restart_clock(void) {}
 #endif
 
+#ifdef CONFIG_SPL_OF_LIST
+void do_dt_magic(void)
+{
+	int ret, rescan;
+
+	if (IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT))
+		do_board_detect();
+
+	/*
+	 * Board detection has been done.
+	 * Let us see if another dtb wouldn't be a better match
+	 * for our board
+	 */
+	if (IS_ENABLED(CONFIG_CPU_V7R)) {
+		ret = fdtdec_resetup(&rescan);
+		if (!ret && rescan) {
+			dm_uninit();
+			dm_init_and_scan(true);
+		}
+	}
+}
+#endif
+
 void board_init_f(ulong dummy)
 {
 #if defined(CONFIG_K3_LOAD_SYSFW)
@@ -106,6 +130,8 @@ void board_init_f(ulong dummy)
 
 	preloader_console_init();
 
+	do_dt_magic();
+
 #if defined(CONFIG_K3_LOAD_SYSFW)
 	/*
 	 * Process pinctrl for serial3 a.k.a. MAIN UART1 module and continue