arch: riscv: dts: dubhe_fpga: Update dts for Dubhe

Signed-off-by: Wei Liang Lim <weiliang.lim@starfivetech.com>

2 files changed, 27 insertions, 88 deletions

diff --git a/arch/riscv/dts/dubhe-fpga-u-boot.dtsi b/arch/riscv/dts/dubhe-fpga-u-boot.dtsi
index fdc3a96b2b..7760d81b27 100644
--- a/arch/riscv/dts/dubhe-fpga-u-boot.dtsi
+++ b/arch/riscv/dts/dubhe-fpga-u-boot.dtsi
@@ -7,22 +7,22 @@
 	};
 
 	config {
-		u-boot,spl-payload-offset = <0x22000>;
+		u-boot,spl-payload-offset = <0x42000>;
 	};
 
 	cpus {
-		u-boot,dm-spl;
+		bootph-all;
 		cpu@0 {
-			u-boot,dm-spl;
+			bootph-all;
 		};
 	};
 
 	memory@80000000 {
-		u-boot,dm-spl;
+		bootph-all;
 	};
 
 	soc {
-		u-boot,dm-spl;
+		bootph-all;
 		dmc: dmc@10280000 {
 			compatible = "starfive,dubhe-ddr";
 			reg = <0x0 0x10280000 0x0 0x10000
@@ -30,40 +30,40 @@
 			       0x0 0x102A0000 0x0 0x10000>;
 			clocks = <&pbus_clk>;
 			clock-frequency = <25000000>;
-			u-boot,dm-spl;
+			bootph-all;
 		};
 	};
 };
 
 &spi0 {
-	u-boot,dm-spl;
+	bootph-all;
 	
 	mmc@0 {
-		u-boot,dm-spl;
+		bootph-all;
 	};
 };
 
 &qspi1 {
-	u-boot,dm-spl;
+	bootph-all;
 
 	flash@0 {
-		u-boot,dm-spl;
+		bootph-all;
 	};
 };
 
 &uart0 {
-	u-boot,dm-spl;
+	bootph-all;
 };
 
 &pbus_clk {
-	u-boot,dm-spl;
+	bootph-all;
 };
 
 &clint {
 	clocks = <&pbus_clk>;
-	u-boot,dm-spl;
+	bootph-all;
 };
 
 &cpu0_intc {
-	u-boot,dm-spl;
+	bootph-all;
 };
diff --git a/arch/riscv/dts/dubhe_fpga.dts b/arch/riscv/dts/dubhe_fpga.dts
index 47b890c545..d1accac57f 100644
--- a/arch/riscv/dts/dubhe_fpga.dts
+++ b/arch/riscv/dts/dubhe_fpga.dts
@@ -10,6 +10,7 @@
 
 	aliases {
 		serial0 = &uart0;
+		spi0 = &qspi1;
 	};
 
 	chosen {
@@ -95,24 +96,29 @@
 
 			partition@0 {
 				reg = <0x000000 0x1000>;
-				label = "boot copier";
+				label = "Boot Copier";
 				/*read-only;*/
 			};
 
 			partition@1000 {
 				reg = <0x1000 0x1000>;
-				label = "boot jump";
+				label = "Boot Jump Code";
 				/*read-only;*/
 			};
 
 			partition@2000 {
-				reg = <0x2000 0x2000>;
-				label = "DTB";
+				reg = <0x2000 0x40000>;
+				label = "U-Boot SPL";
 			};
 
-			partition@4000 {
-				reg = <0x4000 0x7ffc000>;
-				label = "FW_payload (OpenSBI and Linux)";
+			partition@42000 {
+				reg = <0x00042000 0x00100000>;
+				label = "U-Boot FIT Image";
+			};
+
+			partition@142000 {
+				reg = <0x00142000 0x07ebe000>;
+				label = "User";
 			};
 		};
         };
@@ -122,70 +128,3 @@
 &uart0 {
 	status = "okay";
 };
-
-&binman {
-	kernel_fit {
-		filename = "kernel.itb";
-		fit {
-			description = "FIT with Linux kernel image and FDT";
-			#address-cells = <1>;
-			images {
-				kernel {
-					description = "Linux kernel";
-					type = "kernel";
-					arch = "riscv";
-					os = "linux";
-					compression = "none";
-					load = <0x80200000>;
-					entry = <0x80200000>;
-					kernel_blob: blob-ext {
-						filename = "Image";
-					};
-				};
-				fdt_kernel {
-					description = "Linux kernel device tree binary";
-					type = "flat_dt";
-					arch = "riscv";
-					compression = "none";
-					load = <0x88000000>;
-					fdt_kernel_blob: blob-ext {
-						filename = "dubhe_fpga_linux.dtb";
-					};
-				};
-			};
-
-			configurations {
-				default = "conf";
-				conf {
-					description = "Starfive Dubhe FPGA";
-					kernel = "kernel";
-					fdt = "fdt_kernel";
-				};
-			};
-		};
-	};
-
-	QSPI_Image_binary {
-		filename = "QSPI-Image.bin";
-		pad-byte = <0xff>;
-
-		bootcopier_blob: blob-ext@0 {
-			filename = "dubhe_fpga_bootcode.bin";
-			offset = <0x0>;
-		};
-
-		bootjump_blob: blob-ext@1 {
-			filename = "dubhe_fpga_bootjump.bin";
-			offset = <0x1000>;
-		};
-
-		u-boot-spl {
-			offset = <0x2000>;
-		};
-
-		qspi_ubootproper_opensbi_blob: blob-ext@2 {
-			filename = "u-boot.itb";
-			offset = <0x42000>;
-		};
-	};
-};
\ No newline at end of file