From 7f1836531b126cfcf584e7d7d71bf8758bb58969 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 17 Aug 2023 14:53:58 +0800
Subject: [PATCH] starfive visionfive2: use stable opensbi release

---
 starfive/visionfive/v2/opensbi.nix | 48 +++++++-----------------------
 1 file changed, 10 insertions(+), 38 deletions(-)

diff --git a/starfive/visionfive/v2/opensbi.nix b/starfive/visionfive/v2/opensbi.nix
index 6a7e84f..5b46fec 100644
--- a/starfive/visionfive/v2/opensbi.nix
+++ b/starfive/visionfive/v2/opensbi.nix
@@ -1,42 +1,14 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, python3
-, withPlatform ? "generic"
-, withPayload ? null
-, withFDT ? null
-}:
+{ opensbi, withPayload, withFDT }:
 
-stdenv.mkDerivation rec {
-  pname = "opensbi";
-  version = "1.3-git-2868f26";
-
-  src = fetchFromGitHub {
-    owner = "riscv-software-src";
-    repo = "opensbi";
-    rev = "2868f26131308ff345382084681ea89c5b0159f1";
-    sha256 = "sha256-E+nVFLSpH6lQ2nVmMlVRTr7qYRVY0ULW7gUvAyTr90I=";
-  };
-
-  postPatch = ''
-    patchShebangs ./scripts
-  '';
-
-  nativeBuildInputs = [ python3 ];
-
-  installFlags = [
-    "I=$(out)"
-  ];
-
-  makeFlags = [
-    "PLATFORM=${withPlatform}"
+(opensbi.override {
+  inherit withPayload withFDT;
+}).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
     "FW_TEXT_START=0x40000000"
-  ] ++ lib.optionals (withPayload != null) [
-    "FW_PAYLOAD_PATH=${withPayload}"
-  ] ++ lib.optionals (withFDT != null) [
-    "FW_FDT_PATH=${withFDT}"
   ];
+})
 
-  dontStrip = true;
-  dontPatchELF = true;
-}