From: Las Safin <me@las.rs>
Date: Sat, 25 Sep 2021 15:29:26 +0000 (+0000)
Subject: Fix building for a Versa ECP5
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fbec752892b0c78e1232e03fc2928de033f1d8da;p=soc.git

Fix building for a Versa ECP5
---

diff --git a/nix/ecp5.nix b/nix/ecp5.nix
index b3d8196f..025799b0 100644
--- a/nix/ecp5.nix
+++ b/nix/ecp5.nix
@@ -1,6 +1,7 @@
 { version }:
 
-{ stdenv, python3Packages, yosys, libresoc-pre-litex, libresoc-pinmux, pkgsCross }:
+{ stdenv, python3Packages, yosys, libresoc-pre-litex, libresoc-pinmux, pkgsCross
+, nextpnr, trellis }:
 
 stdenv.mkDerivation {
   pname = "libresoc-versa-ecp5";
@@ -12,7 +13,7 @@ stdenv.mkDerivation {
     (with python3Packages; [
     python libresoc-soc litex-boards litex litedram liteeth liteiclink litescope litesdcard
     ])
-    ++ [ pkgsCross.powernv.buildPackages.gcc ];
+    ++ [ trellis nextpnr pkgsCross.powernv.buildPackages.gcc ];
 
   postPatch = ''
     patchShebangs --build .
@@ -31,6 +32,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     runHook preInstall
+    mv /build/florent/build/versa_ecp5/gateware/versa_ecp5.svf $out
     runHook postInstall
   '';