[PATCH v3 11/13] riscv: dts: jh7110: Support multiple DTBs in a Fit image

[Hal Feng]

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

Signed-off-by: Hal Feng <hal.f...@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 cfd3c04aec..995a4f667b 100644
--- a/arch/riscv/dts/jh7110-common-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-common-u-boot.dtsi
@@ -119,20 +119,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