diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | nix/peakrdl/0001-Add-verilator-MULTIDRIVEN-hack.patch | 24 | ||||
| -rw-r--r-- | nix/peakrdl/peakrdl-regblock.nix (renamed from nix/peakrdl-regblock.nix) | 4 | ||||
| -rw-r--r-- | nix/peakrdl/peakrdl.nix (renamed from nix/peakrdl.nix) | 0 | ||||
| -rw-r--r-- | nix/peakrdl/systemrdl-compiler.nix (renamed from nix/systemrdl-compiler.nix) | 0 |
5 files changed, 30 insertions, 2 deletions
@@ -149,8 +149,8 @@ pillow pytest # Para cocotb (py.callPackage ./nix/cocotb-coverage.nix { }) - (py.callPackage ./nix/peakrdl.nix { }) - (py.callPackage ./nix/peakrdl-regblock.nix { }) + (py.callPackage ./nix/peakrdl/peakrdl.nix { }) + (py.callPackage ./nix/peakrdl/peakrdl-regblock.nix { }) (py.callPackage ./nix/pyuvm.nix { }) ])) rv32Pkgs.stdenv.cc.cc diff --git a/nix/peakrdl/0001-Add-verilator-MULTIDRIVEN-hack.patch b/nix/peakrdl/0001-Add-verilator-MULTIDRIVEN-hack.patch new file mode 100644 index 0000000..13bf7c1 --- /dev/null +++ b/nix/peakrdl/0001-Add-verilator-MULTIDRIVEN-hack.patch @@ -0,0 +1,24 @@ +From aef302875ec38e6f91e04f9368ba0ed84cc73b69 Mon Sep 17 00:00:00 2001 +From: Alejandro Soto <alejandro@34project.org> +Date: Sun, 5 May 2024 18:17:10 -0600 +Subject: [PATCH] Add verilator MULTIDRIVEN hack + +--- + src/peakrdl_regblock/module_tmpl.sv | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/peakrdl_regblock/module_tmpl.sv b/src/peakrdl_regblock/module_tmpl.sv +index bcb8566..92183b5 100644 +--- a/src/peakrdl_regblock/module_tmpl.sv ++++ b/src/peakrdl_regblock/module_tmpl.sv +@@ -27,6 +27,7 @@ module {{ds.module_name}} + {{hwif.port_declaration|indent(8)}} + ); + ++ // verilator lint_off MULTIDRIVEN + //-------------------------------------------------------------------------- + // CPU Bus interface logic + //-------------------------------------------------------------------------- +-- +2.42.0 + diff --git a/nix/peakrdl-regblock.nix b/nix/peakrdl/peakrdl-regblock.nix index daacc5a..3a3f0f6 100644 --- a/nix/peakrdl-regblock.nix +++ b/nix/peakrdl/peakrdl-regblock.nix @@ -19,6 +19,10 @@ buildPythonPackage { sha256 = "sha256-N+YZSuHdSSMCmgko5YZpa7wDj3vMy2J7prPdfjj53GA="; }; + patches = [ + ./0001-Add-verilator-MULTIDRIVEN-hack.patch + ]; + propagatedBuildInputs = [ jinja2 (callPackage ./systemrdl-compiler.nix { }) diff --git a/nix/peakrdl.nix b/nix/peakrdl/peakrdl.nix index 48cf1fa..48cf1fa 100644 --- a/nix/peakrdl.nix +++ b/nix/peakrdl/peakrdl.nix diff --git a/nix/systemrdl-compiler.nix b/nix/peakrdl/systemrdl-compiler.nix index 00c92d7..00c92d7 100644 --- a/nix/systemrdl-compiler.nix +++ b/nix/peakrdl/systemrdl-compiler.nix |