Skip to contentSkip to conversation

riscv: dts: starfive: split out visionfive2 target specific configuration

PATCH In review E Shattow 3 participants 3 messages Jan 1, 2025 – Jan 16, 2025 RISC-V

lore
Share & tools
lore

E Shattow

author
#0 lore raw

PATCH 1/1 riscv: dts: starfive: split out visionfive2 target specific configuration

Split out StarFive VisionFive2 multi-board target specific configuration into starfive-visionfive2-binman.dtsi in preparation for removal of jh7110-u-boot and jh7110-common-u-boot in part or whole as sent upstream.

---
 arch/riscv/dts/jh7110-common-u-boot.dtsi      |  95 ----------------
 arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi  |   1 +
 .../dts/jh7110-pine64-star64-u-boot.dtsi      |   1 +
 ...10-starfive-visionfive-2-v1.2a-u-boot.dtsi |   1 +
 ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi |   1 +
 .../dts/starfive-visionfive2-binman.dtsi      | 102 ++++++++++++++++++
 6 files changed, 106 insertions(+), 95 deletions(-)
 create mode 100644 arch/riscv/dts/starfive-visionfive2-binman.dtsi
arch/riscv/dts/jh7110-common-u-boot.dtsi +0 -95
index 7871294e90d..6d85b2d91a7 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2023 StarFive Technology Co., Ltd.
  */
 
-#include "binman.dtsi"
 #include "jh7110-u-boot.dtsi"
 / {
 	aliases {
@@ -19,11 +18,6 @@
 		bootph-pre-ram;
 	};
 
-	config {
-		bootph-pre-ram;
-		u-boot,spl-payload-offset = <0x100000>;
-	};
-
 	memory@40000000 {
 		bootph-pre-ram;
 	};
@@ -104,92 +98,3 @@
 		pagesize = <16>;
 	};
 };
-
-&binman {
-	itb {
-		fit {
-			images {
-				fdt-jh7110-milkv-mars {
-					description = "jh7110-milkv-mars";
-					load = <0x40400000>;
-					compression = "none";
-
-					blob-ext {
-						filename = "dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dtb";
-					};
-				};
-
-				fdt-jh7110-pine64-star64 {
-					description = "jh7110-pine64-star64";
-					load = <0x40400000>;
-					compression = "none";
-
-					blob-ext {
-						filename = "dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dtb";
-					};
-				};
-
-				fdt-jh7110-starfive-visionfive-2-v1.2a {
-					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-jh7110-starfive-visionfive-2-v1.3b {
-					description = "jh7110-starfive-visionfive-2-v1.3b";
-					load = <0x40400000>;
-					compression = "none";
-
-					blob-ext {
-						filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";
-					};
-				};
-			};
-
-			configurations {
-				conf-jh7110-milkv-mars {
-					description = "jh7110-milkv-mars";
-					firmware = "opensbi";
-					loadables = "uboot";
-					fdt = "fdt-jh7110-milkv-mars";
-				};
-
-				conf-jh7110-pine64-star64 {
-					description = "jh7110-pine64-star64";
-					firmware = "opensbi";
-					loadables = "uboot";
-					fdt = "fdt-jh7110-pine64-star64";
-				};
-
-				conf-jh7110-starfive-visionfive-2-v1.2a {
-					description = "jh7110-starfive-visionfive-2-v1.2a";
-					firmware = "opensbi";
-					loadables = "uboot";
-					fdt = "fdt-jh7110-starfive-visionfive-2-v1.2a";
-				};
-
-				conf-jh7110-starfive-visionfive-2-v1.3b {
-					description = "jh7110-starfive-visionfive-2-v1.3b";
-					firmware = "opensbi";
-					loadables = "uboot";
-					fdt = "fdt-jh7110-starfive-visionfive-2-v1.3b";
-				};
-			};
-		};
-	};
-
-	spl-img {
-		filename = "spl/u-boot-spl.bin.normal.out";
-
-		mkimage {
-			args = "-T sfspl";
-
-			u-boot-spl {
-			};
-		};
-	};
-};
arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi +1 -0
index 9df1e5db553..ab882d07f6f 100644
@@ -4,3 +4,4 @@
  */
 
 #include "jh7110-common-u-boot.dtsi"
+#include "starfive-visionfive2-binman.dtsi"
arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi +1 -0
index 9df1e5db553..ab882d07f6f 100644
@@ -4,3 +4,4 @@
  */
 
 #include "jh7110-common-u-boot.dtsi"
+#include "starfive-visionfive2-binman.dtsi"
arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi +1 -0
index 9df1e5db553..ab882d07f6f 100644
@@ -4,3 +4,4 @@
  */
 
 #include "jh7110-common-u-boot.dtsi"
+#include "starfive-visionfive2-binman.dtsi"
arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi +1 -0
index e6bc6630dcd..874074174ff 100644
@@ -4,3 +4,4 @@
  */
 
 #include "jh7110-common-u-boot.dtsi"
+#include "starfive-visionfive2-binman.dtsi"
arch/riscv/dts/starfive-visionfive2-binman.dtsi new file +102 -0

102 lines not on this page · raw message

base-commit: 43cae09eabf398ede30fd4ed1664e2ee6c447d34

Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · E Shattow

Split out StarFive VisionFive2 multi-board target specific configuration into starfive-visionfive2-binman.dtsi in preparation for removal of jh7110-u-boot and jh7110-common-u-boot in part or whole as sent upstream.

Quoted 9 lines
---
 arch/riscv/dts/jh7110-common-u-boot.dtsi      |  95 ----------------
 arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi  |   1 +
 .../dts/jh7110-pine64-star64-u-boot.dtsi      |   1 +
 ...10-starfive-visionfive-2-v1.2a-u-boot.dtsi |   1 +
 ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi |   1 +
 .../dts/starfive-visionfive2-binman.dtsi      | 102 ++++++++++++++++++
 6 files changed, 106 insertions(+), 95 deletions(-)
 create mode 100644 arch/riscv/dts/starfive-visionfive2-binman.dtsi
Reviewed-by on v1 1/1
#2 lore raw
In reply to E Shattow

Hi E Shattow,

Quoted 268 lines · E Shattow

Split out StarFive VisionFive2 multi-board target specific configuration into starfive-visionfive2-binman.dtsi in preparation for removal of jh7110-u-boot and jh7110-common-u-boot in part or whole as sent upstream.

---
 arch/riscv/dts/jh7110-common-u-boot.dtsi      |  95 ----------------
 arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi  |   1 +
 .../dts/jh7110-pine64-star64-u-boot.dtsi      |   1 +
 ...10-starfive-visionfive-2-v1.2a-u-boot.dtsi |   1 +
 ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi |   1 +
 .../dts/starfive-visionfive2-binman.dtsi      | 102 ++++++++++++++++++
 6 files changed, 106 insertions(+), 95 deletions(-)
 create mode 100644 arch/riscv/dts/starfive-visionfive2-binman.dtsi
arch/riscv/dts/jh7110-common-u-boot.dtsi +0 -95
index 7871294e90d..6d85b2d91a7 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2023 StarFive Technology Co., Ltd.
  */
 
-#include "binman.dtsi"
 #include "jh7110-u-boot.dtsi"
 / {
        aliases {
@@ -19,11 +18,6 @@
                bootph-pre-ram;
        };
 
-       config {
-               bootph-pre-ram;
-               u-boot,spl-payload-offset = <0x100000>;
-       };
-
        memory@40000000 {
                bootph-pre-ram;
        };
@@ -104,92 +98,3 @@
                pagesize = <16>;
        };
 };
-
-&binman {
-       itb {
-               fit {
-                       images {
-                               fdt-jh7110-milkv-mars {
-                                       description = "jh7110-milkv-mars";
-                                       load = <0x40400000>;
-                                       compression = "none";
-
-                                       blob-ext {
-                                               filename = "dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dtb";
-                                       };
-                               };
-
-                               fdt-jh7110-pine64-star64 {
-                                       description = "jh7110-pine64-star64";
-                                       load = <0x40400000>;
-                                       compression = "none";
-
-                                       blob-ext {
-                                               filename = "dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dtb";
-                                       };
-                               };
-
-                               fdt-jh7110-starfive-visionfive-2-v1.2a {
-                                       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-jh7110-starfive-visionfive-2-v1.3b {
-                                       description = "jh7110-starfive-visionfive-2-v1.3b";
-                                       load = <0x40400000>;
-                                       compression = "none";
-
-                                       blob-ext {
-                                               filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";
-                                       };
-                               };
-                       };
-
-                       configurations {
-                               conf-jh7110-milkv-mars {
-                                       description = "jh7110-milkv-mars";
-                                       firmware = "opensbi";
-                                       loadables = "uboot";
-                                       fdt = "fdt-jh7110-milkv-mars";
-                               };
-
-                               conf-jh7110-pine64-star64 {
-                                       description = "jh7110-pine64-star64";
-                                       firmware = "opensbi";
-                                       loadables = "uboot";
-                                       fdt = "fdt-jh7110-pine64-star64";
-                               };
-
-                               conf-jh7110-starfive-visionfive-2-v1.2a {
-                                       description = "jh7110-starfive-visionfive-2-v1.2a";
-                                       firmware = "opensbi";
-                                       loadables = "uboot";
-                                       fdt = "fdt-jh7110-starfive-visionfive-2-v1.2a";
-                               };
-
-                               conf-jh7110-starfive-visionfive-2-v1.3b {
-                                       description = "jh7110-starfive-visionfive-2-v1.3b";
-                                       firmware = "opensbi";
-                                       loadables = "uboot";
-                                       fdt = "fdt-jh7110-starfive-visionfive-2-v1.3b";
-                               };
-                       };
-               };
-       };
-
-       spl-img {
-               filename = "spl/u-boot-spl.bin.normal.out";
-
-               mkimage {
-                       args = "-T sfspl";
-
-                       u-boot-spl {
-                       };
-               };
-       };
-};
arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi +1 -0
index 9df1e5db553..ab882d07f6f 100644
@@ -4,3 +4,4 @@
  */
 
 #include "jh7110-common-u-boot.dtsi"
+#include "starfive-visionfive2-binman.dtsi"
arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi +1 -0
index 9df1e5db553..ab882d07f6f 100644
@@ -4,3 +4,4 @@
  */
 
 #include "jh7110-common-u-boot.dtsi"
+#include "starfive-visionfive2-binman.dtsi"
arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi +1 -0
index 9df1e5db553..ab882d07f6f 100644
@@ -4,3 +4,4 @@
  */
 
 #include "jh7110-common-u-boot.dtsi"
+#include "starfive-visionfive2-binman.dtsi"
arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi +1 -0
index e6bc6630dcd..874074174ff 100644
@@ -4,3 +4,4 @@
  */
 
 #include "jh7110-common-u-boot.dtsi"
+#include "starfive-visionfive2-binman.dtsi"
arch/riscv/dts/starfive-visionfive2-binman.dtsi new file +92 -0
new file mode 100644
index 00000000000..4cce001e80d
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright (C) 2023 StarFive Technology Co., Ltd.
+ */
+
+#include "binman.dtsi"
+
+/ {
+       config {
+               bootph-pre-ram;
+               u-boot,spl-payload-offset = <0x100000>;
+       };
+};
+
+&binman {
+       itb {
+               fit {
+                       images {
+                               fdt-jh7110-milkv-mars {
+                                       description = "jh7110-milkv-mars";
+                                       load = <0x40400000>;
+                                       compression = "none";
+
+                                       blob-ext {
+                                               filename = "dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dtb";
+                                       };
+                               };
+
+                               fdt-jh7110-pine64-star64 {
+                                       description = "jh7110-pine64-star64";
+                                       load = <0x40400000>;
+                                       compression = "none";
+
+                                       blob-ext {
+                                               filename = "dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dtb";
+                                       };
+                               };
+
+                               fdt-jh7110-starfive-visionfive-2-v1.2a {
+                                       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-jh7110-starfive-visionfive-2-v1.3b {
+                                       description = "jh7110-starfive-visionfive-2-v1.3b";
+                                       load = <0x40400000>;
+                                       compression = "none";
+
+                                       blob-ext {
+                                               filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";
+                                       };
+                               };
+                       };
+
+                       configurations {
+                               conf-jh7110-milkv-mars {
+                                       description = "jh7110-milkv-mars";
+                                       firmware = "opensbi";
+                                       loadables = "uboot";
+                                       fdt = "fdt-jh7110-milkv-mars";
+                               };
+
+                               conf-jh7110-pine64-star64 {
+                                       description = "jh7110-pine64-star64";
+                                       firmware = "opensbi";
+                                       loadables = "uboot";
+                                       fdt = "fdt-jh7110-pine64-star64";
+                               };
+
+                               conf-jh7110-starfive-visionfive-2-v1.2a {
+                                       description = "jh7110-starfive-visionfive-2-v1.2a";
+                                       firmware = "opensbi";
+                                       loadables = "uboot";
+                                       fdt = "fdt-jh7110-starfive-visionfive-2-v1.2a";
+                               };
+
+                               conf-jh7110-starfive-visionfive-2-v1.3b {
+                                       description = "jh7110-starfive-visionfive-2-v1.3b";
+                                       firmware = "opensbi";
+                                       loadables = "uboot";
+                                       fdt = "fdt-jh7110-starfive-visionfive-2-v1.3b";
+                               };
+                       };
+               };
+       };
+
+       spl-img {

arch/riscv/dts/starfive-visionfive2-binman.dtsi line 102

Quoted 10 lines
arch/riscv/dts/starfive-visionfive2-binman.dtsi new file +10 -0
+               filename = "spl/u-boot-spl.bin.normal.out";
+
+               mkimage {
+                       args = "-T sfspl";
+
+                       u-boot-spl {
+                       };
+               };
+       };
+};

Thanks
-Anand

Quoted 5 lines

base-commit: 43cae09eabf398ede30fd4ed1664e2ee6c447d34

--
2.45.2