All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hal Feng <hal.feng@starfivetech.com>
To: Leo <ycliang@andestech.com>, Tom Rini <trini@konsulko.com>,
	Sumit Garg <sumit.garg@linaro.org>,
	Rick Chen <rick@andestech.com>,
	Heinrich Schuchardt <xypron.glpk@gmx.de>,
	H Bell <dmoo_dv@protonmail.com>, E Shattow <lucent@gmail.com>,
	Conor Dooley <conor.dooley@microchip.com>,
	Nam Cao <namcao@linutronix.de>, Bo Gan <ganboing@gmail.com>
Cc: Emil Renner Berthing <emil.renner.berthing@canonical.com>,
	Minda Chen <minda.chen@starfivetech.com>,
	Hal Feng <hal.feng@starfivetech.com>,
	u-boot@lists.denx.de
Subject: [PATCH v7 11/12] board: starfive: spl: Support multiple DTBs for JH7110 based boards
Date: Tue,  3 Dec 2024 11:04:29 +0800	[thread overview]
Message-ID: <20241203030430.26089-12-hal.feng@starfivetech.com> (raw)
In-Reply-To: <20241203030430.26089-1-hal.feng@starfivetech.com>

Get product ID and the other information from EEPROM, use them to select
the correct DTB.

Tested-by: Anand Moon <linux.amoon@gmail.com>
Tested-by: E Shattow <lucent@gmail.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
---
 board/starfive/visionfive2/spl.c | 33 ++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c
index cf7f39d5c5..22afd76c6b 100644
--- a/board/starfive/visionfive2/spl.c
+++ b/board/starfive/visionfive2/spl.c
@@ -113,7 +113,36 @@ void board_init_f(ulong dummy)
 #if CONFIG_IS_ENABLED(LOAD_FIT)
 int board_fit_config_name_match(const char *name)
 {
-	/* boot using first FIT config */
-	return 0;
+	const char *product_id;
+	u8 version;
+
+	product_id = get_product_id_from_eeprom();
+
+	if (!strncmp(product_id, "VF7110", 6)) {
+		version = get_pcb_revision_from_eeprom();
+		if ((version == 'b' || version == 'B') &&
+		    !strcmp(name, "jh7110-starfive-visionfive-2-v1.3b"))
+			return 0;
+
+		if ((version == 'a' || version == 'A') &&
+		    !strcmp(name, "jh7110-starfive-visionfive-2-v1.2a"))
+			return 0;
+	} else if (!strncmp(product_id, "MARS", 4) &&
+		   !strcmp(name, "jh7110-milkv-mars")) {
+		return 0;
+	} else if (!strncmp(product_id, "MARC", 4)) {
+		if (!get_mmc_size_from_eeprom()) {
+			if (!strcmp(name, "jh7110-milkv-mars-cm-lite"))
+				return 0;
+		} else {
+			if (!strcmp(name, "jh7110-milkv-mars-cm"))
+				return 0;
+		}
+	} else if (!strncmp(product_id, "STAR64", 6) &&
+		   !strcmp(name, "jh7110-pine64-star64")) {
+		return 0;
+	}
+
+	return -EINVAL;
 }
 #endif
-- 
2.43.2


  parent reply	other threads:[~2024-12-03  3:13 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-03  3:04 [PATCH v7 00/12] Support OF_UPSTREAM for StarFive JH7110 Hal Feng
2024-12-03  3:04 ` [PATCH v7 01/12] dts: starfive: Switch to using upstream DT Hal Feng
2024-12-03  3:04 ` [PATCH v7 02/12] riscv: dts: jh7110: Make u-boot device trees adapting to " Hal Feng
2024-12-04 19:07   ` E Shattow
2024-12-06  2:16     ` Hal Feng
2024-12-03  3:04 ` [PATCH v7 03/12] mmc: dw_mmc: Add "starfive, jh7110-mmc" compatible to match " Hal Feng
2024-12-04  0:27   ` Jaehoon Chung
2024-12-03  3:04 ` [PATCH v7 04/12] pcie: starfive: Make the driver compatible with " Hal Feng
2024-12-03  3:04 ` [PATCH v7 05/12] riscv: dts: jh7110: Move common code to the new jh7110-common-u-boot.dtsi Hal Feng
2024-12-03 19:15   ` E Shattow
2024-12-04  6:52     ` Hal Feng
2024-12-04 10:56       ` E Shattow
2024-12-05  6:08         ` Hal Feng
2024-12-03  3:04 ` [PATCH v7 06/12] riscv: dts: jh7110: Add u-boot device tree for JH7110 based boards Hal Feng
2024-12-03  3:04 ` [PATCH v7 07/12] board: starfive: spl: Drop the unneeded DT modification code Hal Feng
2024-12-03  3:04 ` [PATCH v7 08/12] configs: visionfive2: Enable MULTI_DTB_FIT for JH7110 based board DT Hal Feng
2024-12-03  3:04 ` [PATCH v7 09/12] riscv: dts: jh7110: Support multiple DTBs in a Fit image Hal Feng
2024-12-03  3:04 ` [PATCH v7 10/12] board: starfive: spl: Fix the wrong use of CONFIG_IS_ENABLED() Hal Feng
2024-12-03  3:04 ` Hal Feng [this message]
2024-12-03  3:04 ` [PATCH v7 12/12] riscv: cpu: jh7110: Sort the list of imply statements Hal Feng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241203030430.26089-12-hal.feng@starfivetech.com \
    --to=hal.feng@starfivetech.com \
    --cc=conor.dooley@microchip.com \
    --cc=dmoo_dv@protonmail.com \
    --cc=emil.renner.berthing@canonical.com \
    --cc=ganboing@gmail.com \
    --cc=lucent@gmail.com \
    --cc=minda.chen@starfivetech.com \
    --cc=namcao@linutronix.de \
    --cc=rick@andestech.com \
    --cc=sumit.garg@linaro.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    --cc=xypron.glpk@gmx.de \
    --cc=ycliang@andestech.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.