Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement MDIO bus controller [Ethernet] #24

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions cabal.project-common
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,12 @@ package recursion-schemes
-- with -O2 provides gains around 5% to 10% in simple benchmarks
package regex-tdfa
optimization: 2

source-repository-package
type: git
location: https://github.com/clash-lang/clash-protocols
tag: ec001d4a3d553ed92d0bee125cb9c86e9e47ba99
subdir: clash-protocols clash-protocols-base

allow-newer:
clash-protocols:tasty
4 changes: 4 additions & 0 deletions clash-cores.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ common basic-config
base >= 4.10 && < 5,
constraints,
containers >=0.5 && <0.8,
clash-protocols,
deepseq,
ghc-typelits-extra >= 0.3.2,
ghc-typelits-knownnat >= 0.6,
ghc-typelits-natnormalise >= 0.6,
Expand All @@ -140,6 +142,7 @@ library
Clash.Cores.Crc
Clash.Cores.Crc.Internal
Clash.Cores.Crc.Catalog
Clash.Cores.Ethernet.Mdio
Clash.Cores.LatticeSemi.ECP5.Blackboxes.IO
Clash.Cores.LatticeSemi.ECP5.IO
Clash.Cores.LatticeSemi.ICE40.Blackboxes.IO
Expand Down Expand Up @@ -222,6 +225,7 @@ test-suite unit-tests

other-modules:
Test.Cores.Crc
Test.Cores.Ethernet.Mdio
Test.Cores.Internal.SampleSPI
Test.Cores.LineCoding8b10b
Test.Cores.Internal.Signals
Expand Down
5 changes: 5 additions & 0 deletions nix/nixpkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ let

circuit-notation =
self.callCabal2nix "circuit-notation" sources.circuit-notation {};
# clash-protocols also requires tasty < 1.5, so we need to jailbreak.
clash-protocols-base =
pkgs.haskell.lib.doJailbreak (self.callCabal2nix "clash-protocols-base" (sources.clash-protocols + "/clash-protocols-base") {});
clash-protocols =
pkgs.haskell.lib.doJailbreak (self.callCabal2nix "clash-protocols" (sources.clash-protocols + "/clash-protocols") {});
doctest-parallel =
self.callCabal2nix "doctest-parallel" sources.doctest-parallel {};
clash-prelude =
Expand Down
13 changes: 13 additions & 0 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,19 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "1.8.1"
},
"clash-protocols": {
"branch": "main",
"description": "a battery-included library for dataflow protocols",
"homepage": "https://clash-lang.org/",
"owner": "clash-lang",
"repo": "clash-protocols",
"rev": "ec001d4a3d553ed92d0bee125cb9c86e9e47ba99",
"sha256": "17n52lfsacn403mqdhbfdpvg53y75fmn835yfplyr027lg3n3xgi",
"type": "tarball",
"url": "https://github.com/clash-lang/clash-protocols/archive/ec001d4a3d553ed92d0bee125cb9c86e9e47ba99.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "1.0"
},
"doctest-parallel": {
"branch": "main",
"description": "Test interactive Haskell examples",
Expand Down
Loading