From db4589c6aa99135e320429e203e1b45de2f98d3e Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 31 Dec 2023 22:43:10 -0500
Subject: [PATCH] starfive visionfive2: adjust opensbi build params to match
 u-boot doc

---
 starfive/visionfive/v2/opensbi.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/starfive/visionfive/v2/opensbi.nix b/starfive/visionfive/v2/opensbi.nix
index 5b46fec..f551234 100644
--- a/starfive/visionfive/v2/opensbi.nix
+++ b/starfive/visionfive/v2/opensbi.nix
@@ -1,14 +1,13 @@
-{ opensbi, withPayload, withFDT }:
+{ opensbi }:
 
-(opensbi.override {
-  inherit withPayload withFDT;
-}).overrideAttrs (attrs: {
+opensbi.overrideAttrs (attrs: {
   makeFlags = attrs.makeFlags ++ [
     # opensbi generic platform default FW_TEXT_START is 0x80000000
     # For JH7110, need to specify the FW_TEXT_START to 0x40000000
     # Otherwise, the fw_payload.bin downloading via jtag will not run.
     # https://github.com/starfive-tech/VisionFive2/blob/7733673d27052dc5a48f1cb1d060279dfa3f0241/Makefile#L274
+    # Also matches u-boot documentation: https://docs.u-boot.org/en/latest/board/starfive/visionfive2.html
     "FW_TEXT_START=0x40000000"
+    "FW_OPTIONS=0"
   ];
 })
-