diff mbox series

[V5,06/12] board: ti: j721s2: Add support for detecting multiple device trees

Message ID 20230110131016.12480-7-sinthu.raja@ti.com
State Superseded
Delegated to: Tom Rini
Headers show
Series AM68: Add support for AM68 Starter Kit | expand

Commit Message

Sinthu Raja Jan. 10, 2023, 1:10 p.m. UTC 
From: Sinthu Raja <sinthu.raja@ti.com>

Update the board_fit_config_name_match() to choose the right dtb
based on the board name read from EEPROM.

Also restrict multpile EEPROM reads by verifying if EEPROM is already
read

Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
---

Changes in V5:
=============
- Add comment to board_fit_config_name_match API as per the review. 

No Changes in V3 and V4.

Changes in V2:
=============
Address review comments:
- Remove support for detecting multiple device trees using different DTB

V1: https://patchwork.ozlabs.org/project/uboot/patch/20221027104846.11820-7-sinthu.raja@ti.com/
V2: https://patchwork.ozlabs.org/project/uboot/patch/20221221135219.24702-7-sinthu.raja@ti.com/
V4: https://patchwork.ozlabs.org/project/uboot/patch/20230104094350.19394-7-sinthu.raja@ti.com/

 board/ti/j721s2/evm.c | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c
index a3adb8704e..63788f8e44 100644
--- a/board/ti/j721s2/evm.c
+++ b/board/ti/j721s2/evm.c
@@ -72,16 +72,6 @@  int dram_init_banksize(void)
 	return 0;
 }
 
-#ifdef CONFIG_SPL_LOAD_FIT
-int board_fit_config_name_match(const char *name)
-{
-	if (!strcmp(name, "k3-j721s2-common-proc-board"))
-		return 0;
-
-	return -1;
-}
-#endif
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
@@ -111,6 +101,9 @@  int do_board_detect(void)
 {
 	int ret;
 
+	if (board_ti_was_eeprom_read())
+		return 0;
+
 	ret = ti_i2c_eeprom_am6_get_base(CONFIG_EEPROM_BUS_ADDRESS,
 					 CONFIG_EEPROM_CHIP_ADDRESS);
 	if (ret) {
@@ -179,6 +172,27 @@  static void setup_serial(void)
 }
 #endif
 
+/*
+ * This function chooses the right dtb based on the board name read from
+ * EEPROM, and it is the safe default for the SoC.
+ */
+#ifdef CONFIG_SPL_LOAD_FIT
+int board_fit_config_name_match(const char *name)
+{
+	bool eeprom_read = board_ti_was_eeprom_read();
+
+	if (!eeprom_read || board_is_j721s2_som()) {
+		if (!strcmp(name, "k3-j721s2-common-proc-board"))
+			return 0;
+	} else if (!eeprom_read || board_is_am68_sk_som()) {
+		if (!strcmp(name, "k3-am68-sk-base-board"))
+			return 0;
+	}
+
+	return -1;
+}
+#endif
+
 int board_late_init(void)
 {
 	if (IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT)) {