public inbox for u-boot@lists.denx.de
 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 v5 08/11] riscv: dts: jh7110: Support multiple DTBs in a Fit image
Date: Tue, 19 Nov 2024 10:04:22 +0800	[thread overview]
Message-ID: <20241119020425.51989-9-hal.feng@starfivetech.com> (raw)
In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com>

Support multiple DTBs for JH7110 based boards, so they can
select the correct DT at runtime.

Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
---
 arch/riscv/dts/jh7110-common-u-boot.dtsi | 60 ++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/arch/riscv/dts/jh7110-common-u-boot.dtsi b/arch/riscv/dts/jh7110-common-u-boot.dtsi
index c44553455e..3928d551c9 100644
--- a/arch/riscv/dts/jh7110-common-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-common-u-boot.dtsi
@@ -113,20 +113,74 @@
 		fit {
 			images {
 				fdt-1 {
-					description = "NAME";
+					description = "jh7110-starfive-visionfive-2-v1.3b";
 					load = <0x40400000>;
 					compression = "none";
 
-					uboot_fdt_blob: blob-ext {
-						filename = "u-boot.dtb";
+					blob-ext {
+						filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";
+					};
+				};
+
+				fdt-2 {
+					description = "jh7110-starfive-visionfive-2-v1.2a";
+					load = <0x40400000>;
+					compression = "none";
+
+					blob-ext {
+						filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.2a.dtb";
+					};
+				};
+
+				fdt-3 {
+					description = "jh7110-milkv-mars";
+					load = <0x40400000>;
+					compression = "none";
+
+					blob-ext {
+						filename = "dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dtb";
+					};
+				};
+
+				fdt-4 {
+					description = "jh7110-pine64-star64";
+					load = <0x40400000>;
+					compression = "none";
+
+					blob-ext {
+						filename = "dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dtb";
 					};
 				};
 			};
 
 			configurations {
 				conf-1 {
+					description = "jh7110-starfive-visionfive-2-v1.3b";
+					firmware = "opensbi";
+					loadables = "uboot";
 					fdt = "fdt-1";
 				};
+
+				conf-2 {
+					description = "jh7110-starfive-visionfive-2-v1.2a";
+					firmware = "opensbi";
+					loadables = "uboot";
+					fdt = "fdt-2";
+				};
+
+				conf-3 {
+					description = "jh7110-milkv-mars";
+					firmware = "opensbi";
+					loadables = "uboot";
+					fdt = "fdt-3";
+				};
+
+				conf-4 {
+					description = "jh7110-pine64-star64";
+					firmware = "opensbi";
+					loadables = "uboot";
+					fdt = "fdt-4";
+				};
 			};
 		};
 	};
-- 
2.43.2


  parent reply	other threads:[~2024-11-19  2:09 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-19  2:04 [PATCH v5 00/11] Support OF_UPSTREAM for StarFive JH7110 Hal Feng
2024-11-19  2:04 ` [PATCH v5 01/11] dts: starfive: Switch to using upstream DT Hal Feng
2024-11-19  4:03   ` Sumit Garg
2024-11-19  2:04 ` [PATCH v5 02/11] riscv: dts: jh7110: Make u-boot device trees adapting to " Hal Feng
2024-11-19  4:06   ` Sumit Garg
2024-11-20  1:47     ` Hal Feng
2024-11-22  6:42     ` E Shattow
2024-11-22  7:44       ` Sumit Garg
2024-11-23 12:12         ` E Shattow
2024-11-25  5:47           ` Sumit Garg
2024-11-24 23:31       ` Hal Feng
2024-11-19  2:04 ` [PATCH v5 03/11] pcie: starfive: Make the driver compatible with " Hal Feng
2024-11-19  2:04 ` [PATCH v5 04/11] riscv: dts: jh7110: Move common code to the new jh7110-common-u-boot.dtsi Hal Feng
2024-11-19  2:04 ` [PATCH v5 05/11] riscv: dts: jh7110: Add u-boot device tree for JH7110 based boards Hal Feng
2024-11-22  0:28   ` E Shattow
2024-11-22  1:55     ` Hal Feng
2024-11-19  2:04 ` [PATCH v5 06/11] board: starfive: spl: Drop the unneeded DT modification code Hal Feng
2024-11-19  2:04 ` [PATCH v5 07/11] configs: visionfive2: Enable MULTI_DTB_FIT for JH7110 based board DT Hal Feng
2024-11-19  2:04 ` Hal Feng [this message]
2024-11-22  9:20   ` [PATCH v5 08/11] riscv: dts: jh7110: Support multiple DTBs in a Fit image E Shattow
2024-11-24 23:38     ` Hal Feng
2024-11-19  2:04 ` [PATCH v5 09/11] board: starfive: spl: Fix the wrong use of CONFIG_IS_ENABLED() Hal Feng
2024-11-19  2:04 ` [PATCH v5 10/11] board: starfive: spl: Support multiple DTBs for JH7110 based boards Hal Feng
2024-11-19  2:04 ` [PATCH v5 11/11] riscv: cpu: jh7110: Sort the list of imply statements Hal Feng
2024-11-22  7:55 ` [PATCH v5 00/11] Support OF_UPSTREAM for StarFive JH7110 E Shattow

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=20241119020425.51989-9-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox