M-Labs/HeavyX
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade nix scripts & example codes to use nmigen-v0.1rc1

Browse Source
This commit is contained in:
Harry Ho 2019-10-17 15:14:32 +08:00
parent 2281c620ce
commit 6638e21796
5 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cores/minerva.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, python3Packages, nmigen, jtagtap }: { stdenv, fetchFromGitHub, python3Packages, nmigen, jtagtap,
yosys, symbiyosys, yices }:
python3Packages.buildPythonPackage { python3Packages.buildPythonPackage {
name = "minerva"; name = "minerva";
@ -6,12 +7,15 @@ python3Packages.buildPythonPackage {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lambdaconcept"; owner = "lambdaconcept";
repo = "minerva"; repo = "minerva";
rev = "eefcbd066f2144422b06b398b4651dbd86db52b6"; rev = "0518621134dd7a551cac5758d9171a24d0c1578f";
sha256 = "0kv5sgyggic90hf4s3xf2aanwqn1961zhvng6hhzmjsqn1m17rdq"; sha256 = "1iqddkfmki7wsb3nsrp145d8qfjv3i9fpgkzvh95rq9nz4l7jy6w";
}; };
propagatedBuildInputs = [ nmigen jtagtap ]; propagatedBuildInputs = [ nmigen jtagtap ];
checkInputs = [ yosys symbiyosys yices ];
checkPhase = "python -m unittest discover minerva.test -v";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A 32-bit RISC-V soft processor"; description = "A 32-bit RISC-V soft processor";
homepage = "https://m-labs.hk/migen"; homepage = "https://m-labs.hk/migen";

16
eda/nmigen-boards.nix
View File

@ -1,15 +1,17 @@
{ stdenv, fetchFromGitHub, python3Packages, nmigen }: { stdenv, fetchgit, python3Packages, nmigen, git }:
python3Packages.buildPythonPackage { python3Packages.buildPythonPackage rec {
name = "nmigen-boards"; name = "nmigen-boards";
version = "2019-10-13";
src = fetchFromGitHub { src = fetchgit {
owner = "m-labs"; url = "https://github.com/m-labs/nmigen-boards";
repo = "nmigen-boards"; rev = "835c175d7cf9d143aea2c7dbc0c870ede655cfc2";
rev = "6e0cc9d2c9c085912d5350f1f88aaa68af1e25d8"; sha256 = "1v0bsy5ccikxmxmsmgq2s14g4dy0df8ka2s6av49833zigjrvh12";
sha256 = "1w3v0hn45hxdmfgl8px0hcc483mq3lzbhrbrgp1nar7f04b2kism"; leaveDotGit = true;
}; };
nativeBuildInputs = [ python3Packages.setuptools_scm git ];
propagatedBuildInputs = [ nmigen ]; propagatedBuildInputs = [ nmigen ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

19
eda/nmigen.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchFromGitHub, python3Packages, yosys, symbiyosys, yices }: { stdenv, python3Packages, yosys, symbiyosys, yices, git }:
python3Packages.buildPythonPackage { python3Packages.buildPythonPackage rec {
name = "nmigen"; pname = "nmigen";
version = "0.1rc1";
src = fetchFromGitHub { src = python3Packages.fetchPypi {
owner = "m-labs"; inherit pname version;
repo = "nmigen"; sha256 = "13vlxn71ackbh8w05fixyxsjypwjginqy9cc5nydlzr3dbhiziw0";
rev = "31c54d32efb9c2851460adc954f5d1fa97800925";
sha256 = "1hyjs9pnqp0291pflcxp7yi944r49fgbh2j01r6h0w42q540dj5s";
}; };
checkPhase = "PATH=${yosys}/bin:${symbiyosys}/bin:${yices}/bin:$PATH python -m unittest discover nmigen.test -v"; checkInputs = [ yosys symbiyosys yices ];
checkPhase = "python -m unittest discover nmigen.test -v";
nativeBuildInputs = [ python3Packages.setuptools_scm git ];
propagatedBuildInputs = [ python3Packages.bitarray python3Packages.pyvcd python3Packages.jinja2 ]; propagatedBuildInputs = [ python3Packages.bitarray python3Packages.pyvcd python3Packages.jinja2 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
examples/simplesoc_ecp5.py
View File

@ -43,7 +43,7 @@ class Top(Elaboratable):
cd_sync = ClockDomain(reset_less=True) cd_sync = ClockDomain(reset_less=True)
m.domains += cd_sync m.domains += cd_sync
m.d.comb += cd_sync.clk.eq(platform.request("clk100").i) m.d.comb += cd_sync.clk.eq(platform.request("clk100").i)
io_user_led = platform.request("user_led").o io_user_led = platform.request("led").o
io_uart_tx = platform.request("uart").tx.o io_uart_tx = platform.request("uart").tx.o
counter = Signal(27) counter = Signal(27)
@ -51,7 +51,7 @@ class Top(Elaboratable):
m.d.comb += io_user_led.eq(counter[-1]) m.d.comb += io_user_led.eq(counter[-1])
m.submodules.cpu = cpu = Minerva(with_icache=False, with_dcache=False, with_muldiv=False) m.submodules.cpu = cpu = Minerva(with_icache=False, with_dcache=False, with_muldiv=False)
m.submodules.ram = ram = wishbone.SRAM(Memory(32, 1024, init=self.firmware)) m.submodules.ram = ram = wishbone.SRAM(Memory(width=32, depth=1024, init=self.firmware))
m.submodules.uart = uart = SimpleWishboneSerial(io_uart_tx, 100e6) m.submodules.uart = uart = SimpleWishboneSerial(io_uart_tx, 100e6)
m.submodules.con = con = wishbone.InterconnectShared( m.submodules.con = con = wishbone.InterconnectShared(
[cpu.ibus, cpu.dbus], [cpu.ibus, cpu.dbus],

13
overlay.nix
View File

@ -2,24 +2,21 @@ self: super:
rec { rec {
yosys = super.yosys.overrideAttrs(oa: rec { yosys = super.yosys.overrideAttrs(oa: rec {
name = "yosys-${version}"; name = "yosys-${version}";
version = "2019-07-27"; version = "0.9";
srcs = [ srcs = [
(super.fetchFromGitHub { (super.fetchFromGitHub {
owner = "yosyshq"; owner = "yosyshq";
repo = "yosys"; repo = "yosys";
rev = "6538671c84a12114a991d59569eede3e0d368758"; rev = "yosys-${version}";
sha256 = "1l6v94a9vh9krmfsmd3v8l8xciwf028xvg93qf80s8a75djm7bc3"; sha256 = "0lb9r055h8y1vj2z8gm4ip0v06j5mk7f9zx9gi67kkqb7g4rhjli";
name = "yosys"; name = "yosys";
}) })
# NOTE: the version of abc used here is synchronized with
# the one in the yosys Makefile of the version above;
# keep them the same for quality purposes.
(super.fetchFromGitHub { (super.fetchFromGitHub {
owner = "berkeley-abc"; owner = "berkeley-abc";
repo = "abc"; repo = "abc";
rev = "5776ad07e7247993976bffed4802a5737c456782"; rev = "3709744c60696c5e3f4cc123939921ce8107fe04";
sha256 = "1la4idmssg44rp6hd63sd5vybvs3vr14yzvwcg03ls37p39cslnl"; sha256 = "18a9cjng3qfalq8m9az5ck1y5h4l2pf9ycrvkzs9hn82b1j7vrax";
name = "yosys-abc"; name = "yosys-abc";
}) })
]; ];