[U-Boot] [PATCH v4 1/2] riscv: dts: Add hifive-unleashed-a00 dts from Linux

[U-Boot] [PATCH v4 1/2] riscv: dts: Add hifive-unleashed-a00 dts from Linux

[Jagan Teki]

Sync the hifive-unleashed-a00 dts from Linux with
below commit details:

commit <2993c9b04e616df0848b655d7202a707a70fc876> ("riscv: dts: HiFive
Unleashed: add default chosen/stdout-path")

Idea is to periodically sync the dts from Linux instead of
tweaking internal changes one after another, so better not
add any intermediate changes in between. This would help to
maintain the dts files easy and meaningful since we are
reusing device tree files from Linux.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v4:
- none

 arch/riscv/dts/Makefile                 |   1 +
 arch/riscv/dts/fu540-c000.dtsi          | 251 ++++++++++++++++++++++++
 arch/riscv/dts/hifive-unleashed-a00.dts |  96 +++++++++
 3 files changed, 348 insertions(+)
 create mode 100644 arch/riscv/dts/fu540-c000.dtsi
 create mode 100644 arch/riscv/dts/hifive-unleashed-a00.dts

diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile
index f9cd606a9a..4f30e6936f 100644
--- a/arch/riscv/dts/Makefile
+++ b/arch/riscv/dts/Makefile
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0+
 
 dtb-$(CONFIG_TARGET_AX25_AE350) += ae350_32.dtb ae350_64.dtb
+dtb-$(CONFIG_TARGET_SIFIVE_FU540) += hifive-unleashed-a00.dtb
 
 targets += $(dtb-y)
 
diff --git a/arch/riscv/dts/fu540-c000.dtsi b/arch/riscv/dts/fu540-c000.dtsi
new file mode 100644
index 0000000000..afa43c7ea3
--- /dev/null
+++ b/arch/riscv/dts/fu540-c000.dtsi
@@ -0,0 +1,251 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/* Copyright (c) 2018-2019 SiFive, Inc */
+
+/dts-v1/;
+
+#include <dt-bindings/clock/sifive-fu540-prci.h>
+
+/ {
+	#address-cells = <2>;
+	#size-cells = <2>;
+	compatible = "sifive,fu540-c000", "sifive,fu540";
+
+	aliases {
+		serial0 = &uart0;
+		serial1 = &uart1;
+		ethernet0 = &eth0;
+	};
+
+	chosen {
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		cpu0: cpu at 0 {
+			compatible = "sifive,e51", "sifive,rocket0", "riscv";
+			device_type = "cpu";
+			i-cache-block-size = <64>;
+			i-cache-sets = <128>;
+			i-cache-size = <16384>;
+			reg = <0>;
+			riscv,isa = "rv64imac";
+			status = "disabled";
+			cpu0_intc: interrupt-controller {
+				#interrupt-cells = <1>;
+				compatible = "riscv,cpu-intc";
+				interrupt-controller;
+			};
+		};
+		cpu1: cpu at 1 {
+			compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+			d-cache-block-size = <64>;
+			d-cache-sets = <64>;
+			d-cache-size = <32768>;
+			d-tlb-sets = <1>;
+			d-tlb-size = <32>;
+			device_type = "cpu";
+			i-cache-block-size = <64>;
+			i-cache-sets = <64>;
+			i-cache-size = <32768>;
+			i-tlb-sets = <1>;
+			i-tlb-size = <32>;
+			mmu-type = "riscv,sv39";
+			reg = <1>;
+			riscv,isa = "rv64imafdc";
+			tlb-split;
+			cpu1_intc: interrupt-controller {
+				#interrupt-cells = <1>;
+				compatible = "riscv,cpu-intc";
+				interrupt-controller;
+			};
+		};
+		cpu2: cpu at 2 {
+			compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+			d-cache-block-size = <64>;
+			d-cache-sets = <64>;
+			d-cache-size = <32768>;
+			d-tlb-sets = <1>;
+			d-tlb-size = <32>;
+			device_type = "cpu";
+			i-cache-block-size = <64>;
+			i-cache-sets = <64>;
+			i-cache-size = <32768>;
+			i-tlb-sets = <1>;
+			i-tlb-size = <32>;
+			mmu-type = "riscv,sv39";
+			reg = <2>;
+			riscv,isa = "rv64imafdc";
+			tlb-split;
+			cpu2_intc: interrupt-controller {
+				#interrupt-cells = <1>;
+				compatible = "riscv,cpu-intc";
+				interrupt-controller;
+			};
+		};
+		cpu3: cpu at 3 {
+			compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+			d-cache-block-size = <64>;
+			d-cache-sets = <64>;
+			d-cache-size = <32768>;
+			d-tlb-sets = <1>;
+			d-tlb-size = <32>;
+			device_type = "cpu";
+			i-cache-block-size = <64>;
+			i-cache-sets = <64>;
+			i-cache-size = <32768>;
+			i-tlb-sets = <1>;
+			i-tlb-size = <32>;
+			mmu-type = "riscv,sv39";
+			reg = <3>;
+			riscv,isa = "rv64imafdc";
+			tlb-split;
+			cpu3_intc: interrupt-controller {
+				#interrupt-cells = <1>;
+				compatible = "riscv,cpu-intc";
+				interrupt-controller;
+			};
+		};
+		cpu4: cpu at 4 {
+			compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+			d-cache-block-size = <64>;
+			d-cache-sets = <64>;
+			d-cache-size = <32768>;
+			d-tlb-sets = <1>;
+			d-tlb-size = <32>;
+			device_type = "cpu";
+			i-cache-block-size = <64>;
+			i-cache-sets = <64>;
+			i-cache-size = <32768>;
+			i-tlb-sets = <1>;
+			i-tlb-size = <32>;
+			mmu-type = "riscv,sv39";
+			reg = <4>;
+			riscv,isa = "rv64imafdc";
+			tlb-split;
+			cpu4_intc: interrupt-controller {
+				#interrupt-cells = <1>;
+				compatible = "riscv,cpu-intc";
+				interrupt-controller;
+			};
+		};
+	};
+	soc {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		compatible = "sifive,fu540-c000", "sifive,fu540", "simple-bus";
+		ranges;
+		plic0: interrupt-controller at c000000 {
+			#interrupt-cells = <1>;
+			compatible = "sifive,plic-1.0.0";
+			reg = <0x0 0xc000000 0x0 0x4000000>;
+			riscv,ndev = <53>;
+			interrupt-controller;
+			interrupts-extended = <
+				&cpu0_intc 0xffffffff
+				&cpu1_intc 0xffffffff &cpu1_intc 9
+				&cpu2_intc 0xffffffff &cpu2_intc 9
+				&cpu3_intc 0xffffffff &cpu3_intc 9
+				&cpu4_intc 0xffffffff &cpu4_intc 9>;
+		};
+		prci: clock-controller at 10000000 {
+			compatible = "sifive,fu540-c000-prci";
+			reg = <0x0 0x10000000 0x0 0x1000>;
+			clocks = <&hfclk>, <&rtcclk>;
+			#clock-cells = <1>;
+		};
+		uart0: serial at 10010000 {
+			compatible = "sifive,fu540-c000-uart", "sifive,uart0";
+			reg = <0x0 0x10010000 0x0 0x1000>;
+			interrupt-parent = <&plic0>;
+			interrupts = <4>;
+			clocks = <&prci PRCI_CLK_TLCLK>;
+			status = "disabled";
+		};
+		uart1: serial at 10011000 {
+			compatible = "sifive,fu540-c000-uart", "sifive,uart0";
+			reg = <0x0 0x10011000 0x0 0x1000>;
+			interrupt-parent = <&plic0>;
+			interrupts = <5>;
+			clocks = <&prci PRCI_CLK_TLCLK>;
+			status = "disabled";
+		};
+		i2c0: i2c at 10030000 {
+			compatible = "sifive,fu540-c000-i2c", "sifive,i2c0";
+			reg = <0x0 0x10030000 0x0 0x1000>;
+			interrupt-parent = <&plic0>;
+			interrupts = <50>;
+			clocks = <&prci PRCI_CLK_TLCLK>;
+			reg-shift = <2>;
+			reg-io-width = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+		qspi0: spi at 10040000 {
+			compatible = "sifive,fu540-c000-spi", "sifive,spi0";
+			reg = <0x0 0x10040000 0x0 0x1000
+			       0x0 0x20000000 0x0 0x10000000>;
+			interrupt-parent = <&plic0>;
+			interrupts = <51>;
+			clocks = <&prci PRCI_CLK_TLCLK>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+		qspi1: spi at 10041000 {
+			compatible = "sifive,fu540-c000-spi", "sifive,spi0";
+			reg = <0x0 0x10041000 0x0 0x1000
+			       0x0 0x30000000 0x0 0x10000000>;
+			interrupt-parent = <&plic0>;
+			interrupts = <52>;
+			clocks = <&prci PRCI_CLK_TLCLK>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+		qspi2: spi at 10050000 {
+			compatible = "sifive,fu540-c000-spi", "sifive,spi0";
+			reg = <0x0 0x10050000 0x0 0x1000>;
+			interrupt-parent = <&plic0>;
+			interrupts = <6>;
+			clocks = <&prci PRCI_CLK_TLCLK>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+		eth0: ethernet at 10090000 {
+			compatible = "sifive,fu540-c000-gem";
+			interrupt-parent = <&plic0>;
+			interrupts = <53>;
+			reg = <0x0 0x10090000 0x0 0x2000
+			       0x0 0x100a0000 0x0 0x1000>;
+			local-mac-address = [00 00 00 00 00 00];
+			clock-names = "pclk", "hclk";
+			clocks = <&prci PRCI_CLK_GEMGXLPLL>,
+				 <&prci PRCI_CLK_GEMGXLPLL>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+		pwm0: pwm at 10020000 {
+			compatible = "sifive,fu540-c000-pwm", "sifive,pwm0";
+			reg = <0x0 0x10020000 0x0 0x1000>;
+			interrupt-parent = <&plic0>;
+			interrupts = <42 43 44 45>;
+			clocks = <&prci PRCI_CLK_TLCLK>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+		pwm1: pwm at 10021000 {
+			compatible = "sifive,fu540-c000-pwm", "sifive,pwm0";
+			reg = <0x0 0x10021000 0x0 0x1000>;
+			interrupt-parent = <&plic0>;
+			interrupts = <46 47 48 49>;
+			clocks = <&prci PRCI_CLK_TLCLK>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+
+	};
+};
diff --git a/arch/riscv/dts/hifive-unleashed-a00.dts b/arch/riscv/dts/hifive-unleashed-a00.dts
new file mode 100644
index 0000000000..88cfcb96bf
--- /dev/null
+++ b/arch/riscv/dts/hifive-unleashed-a00.dts
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/* Copyright (c) 2018-2019 SiFive, Inc */
+
+#include "fu540-c000.dtsi"
+
+/* Clock frequency (in Hz) of the PCB crystal for rtcclk */
+#define RTCCLK_FREQ		1000000
+
+/ {
+	#address-cells = <2>;
+	#size-cells = <2>;
+	model = "SiFive HiFive Unleashed A00";
+	compatible = "sifive,hifive-unleashed-a00", "sifive,fu540-c000";
+
+	chosen {
+		stdout-path = "serial0";
+	};
+
+	cpus {
+		timebase-frequency = <RTCCLK_FREQ>;
+	};
+
+	memory at 80000000 {
+		device_type = "memory";
+		reg = <0x0 0x80000000 0x2 0x00000000>;
+	};
+
+	soc {
+	};
+
+	hfclk: hfclk {
+		#clock-cells = <0>;
+		compatible = "fixed-clock";
+		clock-frequency = <33333333>;
+		clock-output-names = "hfclk";
+	};
+
+	rtcclk: rtcclk {
+		#clock-cells = <0>;
+		compatible = "fixed-clock";
+		clock-frequency = <RTCCLK_FREQ>;
+		clock-output-names = "rtcclk";
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+};
+
+&qspi0 {
+	status = "okay";
+	flash at 0 {
+		compatible = "issi,is25wp256", "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <50000000>;
+		m25p,fast-read;
+		spi-tx-bus-width = <4>;
+		spi-rx-bus-width = <4>;
+	};
+};
+
+&qspi2 {
+	status = "okay";
+	mmc at 0 {
+		compatible = "mmc-spi-slot";
+		reg = <0>;
+		spi-max-frequency = <20000000>;
+		voltage-ranges = <3300 3300>;
+		disable-wp;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	phy-mode = "gmii";
+	phy-handle = <&phy0>;
+	phy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
+};
+
+&pwm0 {
+	status = "okay";
+};
+
+&pwm1 {
+	status = "okay";
+};
-- 
2.18.0.321.gffc6fa0e3

[U-Boot] [PATCH v4 2/2] sifive: fu540: Enable OF_SEPARATE

[Jagan Teki]

Use dts support from U-Boot via OF_SEPARATE instead of depending from
opensbi.

This would help to make the necessary changes in drivers and device trees
in U-Boot tree itself. This feature would also be helpful to not pass
dtb during opensbi builds.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v4:
- Drop abosolete text

 configs/sifive_fu540_defconfig | 3 ++-
 doc/board/sifive/fu540.rst     | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig
index 48865e5f11..979d0a0418 100644
--- a/configs/sifive_fu540_defconfig
+++ b/configs/sifive_fu540_defconfig
@@ -6,6 +6,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_MISC_INIT_R=y
+CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00"
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
-CONFIG_OF_PRIOR_STAGE=y
+CONFIG_OF_SEPARATE=y
diff --git a/doc/board/sifive/fu540.rst b/doc/board/sifive/fu540.rst
index 7807f5b2c1..dd279f6a03 100644
--- a/doc/board/sifive/fu540.rst
+++ b/doc/board/sifive/fu540.rst
@@ -58,10 +58,7 @@ firmware. We need to compile OpenSBI with below command:
 
 .. code-block:: none
 
-    make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=<path to u-boot.bin> FW_PAYLOAD_FDT_PATH=<path to hifive-unleashed-a00.dtb from Linux>
-
-(Note: Prefer hifive-unleashed-a00.dtb from Linux-5.3 or higher)
-(Note: Linux-5.2 is also fine but it does not have ethernet DT node)
+    make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=<path to u-boot-dtb.bin>
 
 More detailed description of steps required to build FW_PAYLOAD firmware
 is beyond the scope of this document. Please refer OpenSBI documenation.
-- 
2.18.0.321.gffc6fa0e3

[U-Boot] [PATCH v4 1/2] riscv: dts: Add hifive-unleashed-a00 dts from Linux

[Bin Meng]

On Mon, Nov 18, 2019 at 7:30 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> Sync the hifive-unleashed-a00 dts from Linux with
> below commit details:
>
> commit <2993c9b04e616df0848b655d7202a707a70fc876> ("riscv: dts: HiFive
> Unleashed: add default chosen/stdout-path")
>
> Idea is to periodically sync the dts from Linux instead of
> tweaking internal changes one after another, so better not
> add any intermediate changes in between. This would help to
> maintain the dts files easy and meaningful since we are
> reusing device tree files from Linux.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v4:
> - none
>
>  arch/riscv/dts/Makefile                 |   1 +
>  arch/riscv/dts/fu540-c000.dtsi          | 251 ++++++++++++++++++++++++
>  arch/riscv/dts/hifive-unleashed-a00.dts |  96 +++++++++
>  3 files changed, 348 insertions(+)
>  create mode 100644 arch/riscv/dts/fu540-c000.dtsi
>  create mode 100644 arch/riscv/dts/hifive-unleashed-a00.dts
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[U-Boot] [PATCH v4 2/2] sifive: fu540: Enable OF_SEPARATE

[Bin Meng]

On Mon, Nov 18, 2019 at 7:30 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> Use dts support from U-Boot via OF_SEPARATE instead of depending from
> opensbi.
>
> This would help to make the necessary changes in drivers and device trees
> in U-Boot tree itself. This feature would also be helpful to not pass
> dtb during opensbi builds.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v4:
> - Drop abosolete text
>
>  configs/sifive_fu540_defconfig | 3 ++-
>  doc/board/sifive/fu540.rst     | 5 +----
>  2 files changed, 3 insertions(+), 5 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[U-Boot] [PATCH v4 1/2] riscv: dts: Add hifive-unleashed-a00 dts from Linux

[Anup Patel]

> -----Original Message-----
> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Bin Meng
> Sent: Monday, November 18, 2019 5:52 PM
> To: Jagan Teki <jagan@amarulasolutions.com>
> Cc: U-Boot Mailing List <u-boot@lists.denx.de>
> Subject: Re: [U-Boot] [PATCH v4 1/2] riscv: dts: Add hifive-unleashed-a00 dts
> from Linux
> 
> On Mon, Nov 18, 2019 at 7:30 PM Jagan Teki <jagan@amarulasolutions.com>
> wrote:
> >
> > Sync the hifive-unleashed-a00 dts from Linux with below commit
> > details:
> >
> > commit <2993c9b04e616df0848b655d7202a707a70fc876> ("riscv: dts: HiFive
> > Unleashed: add default chosen/stdout-path")
> >
> > Idea is to periodically sync the dts from Linux instead of tweaking
> > internal changes one after another, so better not add any intermediate
> > changes in between. This would help to maintain the dts files easy and
> > meaningful since we are reusing device tree files from Linux.
> >
> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > ---
> > Changes for v4:
> > - none
> >
> >  arch/riscv/dts/Makefile                 |   1 +
> >  arch/riscv/dts/fu540-c000.dtsi          | 251 ++++++++++++++++++++++++
> >  arch/riscv/dts/hifive-unleashed-a00.dts |  96 +++++++++
> >  3 files changed, 348 insertions(+)
> >  create mode 100644 arch/riscv/dts/fu540-c000.dtsi  create mode 100644
> > arch/riscv/dts/hifive-unleashed-a00.dts
> >
> 
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

LGTM.

Reviewed-by: Anup Patel <anup.patel@wdc.com>

Regards,
Anup

[U-Boot] [PATCH v4 2/2] sifive: fu540: Enable OF_SEPARATE

[Anup Patel]

> -----Original Message-----
> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Bin Meng
> Sent: Monday, November 18, 2019 5:52 PM
> To: Jagan Teki <jagan@amarulasolutions.com>
> Cc: U-Boot Mailing List <u-boot@lists.denx.de>
> Subject: Re: [U-Boot] [PATCH v4 2/2] sifive: fu540: Enable OF_SEPARATE
> 
> On Mon, Nov 18, 2019 at 7:30 PM Jagan Teki <jagan@amarulasolutions.com>
> wrote:
> >
> > Use dts support from U-Boot via OF_SEPARATE instead of depending from
> > opensbi.
> >
> > This would help to make the necessary changes in drivers and device
> > trees in U-Boot tree itself. This feature would also be helpful to not
> > pass dtb during opensbi builds.
> >
> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > ---
> > Changes for v4:
> > - Drop abosolete text
> >
> >  configs/sifive_fu540_defconfig | 3 ++-
> >  doc/board/sifive/fu540.rst     | 5 +----
> >  2 files changed, 3 insertions(+), 5 deletions(-)
> >
> 
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

LGTM.

Reviewed-by: Anup Patel <anup.patel@wdc.com>

It would be great if this patches are merged for U-Boot-2020.01.

Can you also update documentation for OpenSBI SiFive FU540
platform support ?

Regards,
Anup

[U-Boot] [PATCH v4 2/2] sifive: fu540: Enable OF_SEPARATE

[Rick Chen]

Hi Jagon

> From: Jagan Teki [mailto:jagan at amarulasolutions.com]
> Sent: Monday, November 18, 2019 7:30 PM
> To: Rick Jian-Zhi Chen(陳建志)
> Cc: u-boot at lists.denx.de; Jagan Teki
> Subject: [PATCH v4 2/2] sifive: fu540: Enable OF_SEPARATE
>
> Use dts support from U-Boot via OF_SEPARATE instead of depending from opensbi.
>
> This would help to make the necessary changes in drivers and device trees in U-Boot tree itself. This feature would also be helpful to not pass dtb during opensbi builds.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v4:
> - Drop abosolete text
>
>  configs/sifive_fu540_defconfig | 3 ++-
>  doc/board/sifive/fu540.rst     | 5 +----
>  2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig index 48865e5f11..979d0a0418 100644
> --- a/configs/sifive_fu540_defconfig
> +++ b/configs/sifive_fu540_defconfig
> @@ -6,6 +6,7 @@ CONFIG_RISCV_SMODE=y
>  CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_FIT=y
>  CONFIG_MISC_INIT_R=y
> +CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00"
>  CONFIG_DISPLAY_CPUINFO=y
>  CONFIG_DISPLAY_BOARDINFO=y
> -CONFIG_OF_PRIOR_STAGE=y
> +CONFIG_OF_SEPARATE=y
> diff --git a/doc/board/sifive/fu540.rst b/doc/board/sifive/fu540.rst index 7807f5b2c1..dd279f6a03 100644
> --- a/doc/board/sifive/fu540.rst
> +++ b/doc/board/sifive/fu540.rst
> @@ -58,10 +58,7 @@ firmware. We need to compile OpenSBI with below command:
>
>  .. code-block:: none
>
> -    make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=<path to u-boot.bin> FW_PAYLOAD_FDT_PATH=<path to hifive-unleashed-a00.dtb from Linux>
> -
> -(Note: Prefer hifive-unleashed-a00.dtb from Linux-5.3 or higher)
> -(Note: Linux-5.2 is also fine but it does not have ethernet DT node)
> +    make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=<path to u-boot-dtb.bin>
>
>  More detailed description of steps required to build FW_PAYLOAD firmware  is beyond the scope of this document. Please refer OpenSBI documenation.
> --
> 2.18.0.321.gffc6fa0e3
>

I am trying to prepare a PR, but it encounter a conflict with the
master when applying this patch.
Can you rebase it again ?

Or if you don't mind I can modify your patch directly.

Thanks
Rick

[PATCH v4 2/2] sifive: fu540: Enable OF_SEPARATE

[Jagan Teki]

Hi Rick,

On Mon, Dec 2, 2019 at 9:02 AM Rick Chen <rickchen36@gmail.com> wrote:
>
> Hi Jagon
>
> > From: Jagan Teki [mailto:jagan at amarulasolutions.com]
> > Sent: Monday, November 18, 2019 7:30 PM
> > To: Rick Jian-Zhi Chen(陳建志)
> > Cc: u-boot at lists.denx.de; Jagan Teki
> > Subject: [PATCH v4 2/2] sifive: fu540: Enable OF_SEPARATE
> >
> > Use dts support from U-Boot via OF_SEPARATE instead of depending from opensbi.
> >
> > This would help to make the necessary changes in drivers and device trees in U-Boot tree itself. This feature would also be helpful to not pass dtb during opensbi builds.
> >
> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > ---
> > Changes for v4:
> > - Drop abosolete text
> >
> >  configs/sifive_fu540_defconfig | 3 ++-
> >  doc/board/sifive/fu540.rst     | 5 +----
> >  2 files changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig index 48865e5f11..979d0a0418 100644
> > --- a/configs/sifive_fu540_defconfig
> > +++ b/configs/sifive_fu540_defconfig
> > @@ -6,6 +6,7 @@ CONFIG_RISCV_SMODE=y
> >  CONFIG_DISTRO_DEFAULTS=y
> >  CONFIG_FIT=y
> >  CONFIG_MISC_INIT_R=y
> > +CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00"
> >  CONFIG_DISPLAY_CPUINFO=y
> >  CONFIG_DISPLAY_BOARDINFO=y
> > -CONFIG_OF_PRIOR_STAGE=y
> > +CONFIG_OF_SEPARATE=y
> > diff --git a/doc/board/sifive/fu540.rst b/doc/board/sifive/fu540.rst index 7807f5b2c1..dd279f6a03 100644
> > --- a/doc/board/sifive/fu540.rst
> > +++ b/doc/board/sifive/fu540.rst
> > @@ -58,10 +58,7 @@ firmware. We need to compile OpenSBI with below command:
> >
> >  .. code-block:: none
> >
> > -    make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=<path to u-boot.bin> FW_PAYLOAD_FDT_PATH=<path to hifive-unleashed-a00.dtb from Linux>
> > -
> > -(Note: Prefer hifive-unleashed-a00.dtb from Linux-5.3 or higher)
> > -(Note: Linux-5.2 is also fine but it does not have ethernet DT node)
> > +    make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=<path to u-boot-dtb.bin>
> >
> >  More detailed description of steps required to build FW_PAYLOAD firmware  is beyond the scope of this document. Please refer OpenSBI documenation.
> > --
> > 2.18.0.321.gffc6fa0e3
> >
>
> I am trying to prepare a PR, but it encounter a conflict with the
> master when applying this patch.
> Can you rebase it again ?
>
> Or if you don't mind I can modify your patch directly.

Sure, please do. thanks.