diff --git a/flake.lock b/flake.lock index 976bb59..39ba71b 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "src-pythonparser": "src-pythonparser" }, "locked": { - "lastModified": 1661404661, - "narHash": "sha256-j3l/plOlK2Hcd4XIC32PDfKvqUY8Apr9sBeczyJ/L8A=", - "ref": "master", - "rev": "b705862ecd014b0c3b69051c1c822f13ce8aeea2", - "revCount": 8144, + "lastModified": 1672816435, + "narHash": "sha256-cH2i+1eoJ+K9rAxctVjUR5oNWi54USjbtXPYj5a0j7A=", + "ref": "refs/heads/master", + "rev": "1be7e2a2e1d142802a52792865b19c8874fd0e9d", + "revCount": 8257, "type": "git", "url": "https://github.com/m-labs/artiq.git" }, @@ -26,6 +26,7 @@ }, "artiq-comtools": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": [ "artiq-zynq", "artiq", @@ -38,11 +39,11 @@ ] }, "locked": { - "lastModified": 1654007592, - "narHash": "sha256-vaDFhE1ItjqtIcinC/6RAJGbj44pxxMUEeQUa3FtgEE=", + "lastModified": 1664405593, + "narHash": "sha256-yP441NerlLGig7n+9xHsx8yCtZ+Ggd0VqfBSzc20E04=", "owner": "m-labs", "repo": "artiq-comtools", - "rev": "cb73281154656ee8f74db1866859e31bf42755cd", + "rev": "15ddac62813ef623a076ccf982b3bc63d314e651", "type": "github" }, "original": { @@ -58,11 +59,11 @@ "zynq-rs": "zynq-rs" }, "locked": { - "lastModified": 1661774127, - "narHash": "sha256-OTJKLZBoJtisDcpjckMsq2PgtgrkwSm5VV51kOPS8yI=", - "ref": "master", - "rev": "38f4d6cd2e7a0c2122bff674e04d4c251fc76b3b", - "revCount": 576, + "lastModified": 1672970276, + "narHash": "sha256-8sj3ju9uyg8dh8gruvgSlkKLgfn3clWBCfKtZHrD/w0=", + "ref": "refs/heads/master", + "rev": "4a522ecb3b4dbdff2cf89078cc1e2c4120a5b94b", + "revCount": 592, "type": "git", "url": "https://git.m-labs.hk/m-labs/artiq-zynq" }, @@ -71,14 +72,29 @@ "url": "https://git.m-labs.hk/m-labs/artiq-zynq" } }, + "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "mozilla-overlay": { "flake": false, "locked": { - "lastModified": 1657214286, - "narHash": "sha256-rO/4oymKXU09wG2bcTt4uthPCp1XsBZjxuCJo3yVXNs=", + "lastModified": 1664789696, + "narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "0508a66e28a5792fdfb126bbf4dec1029c2509e0", + "rev": "80627b282705101e7b38e19ca6e8df105031b072", "type": "github" }, "original": { @@ -90,11 +106,11 @@ "mozilla-overlay_2": { "flake": false, "locked": { - "lastModified": 1657214286, - "narHash": "sha256-rO/4oymKXU09wG2bcTt4uthPCp1XsBZjxuCJo3yVXNs=", + "lastModified": 1672878308, + "narHash": "sha256-0+fl6PHokhtSV+w58z2QD2rTf8QhcOGsT9o4LwHHZHE=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "0508a66e28a5792fdfb126bbf4dec1029c2509e0", + "rev": "d38863db88e100866b3e494a651ee4962b762fcc", "type": "github" }, "original": { @@ -106,11 +122,11 @@ "mozilla-overlay_3": { "flake": false, "locked": { - "lastModified": 1650459918, - "narHash": "sha256-sroCK+QJTmoXtcRkwZyKOP9iAYOPID2Bwdxn4GkG16w=", + "lastModified": 1664789696, + "narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "e1f7540fc0a8b989fb8cf701dc4fd7fc76bcf168", + "rev": "80627b282705101e7b38e19ca6e8df105031b072", "type": "github" }, "original": { @@ -121,16 +137,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657123678, - "narHash": "sha256-cowVkScfUPlbBXUp08MeVk/wgm9E1zp1uC+9no2hZYw=", + "lastModified": 1669735802, + "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "316b762afdb9e142a803f29c49a88b4a47db80ee", + "rev": "731cc710aeebecbf45a258e977e8b68350549522", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -149,11 +165,11 @@ ] }, "locked": { - "lastModified": 1654830914, - "narHash": "sha256-tratXcWu6Dgzd0Qd9V6EMjuNlE9qDN1pKFhP+Gt0b64=", + "lastModified": 1669369686, + "narHash": "sha256-YHez+S3PTUgtuliUNB5WM+RXcj8RKLbHVRvOgELSkwU=", "owner": "m-labs", "repo": "sipyco", - "rev": "58b0935f7ae47659abee5b5792fa594153328d6f", + "rev": "98db6eacb084c2c5280fb653bee3d313e3ca6df8", "type": "github" }, "original": { @@ -165,11 +181,11 @@ "src-migen": { "flake": false, "locked": { - "lastModified": 1656649178, - "narHash": "sha256-A91sZRrprEuPOtIUVxm6wX5djac9wnNZQ4+cU1nvJPc=", + "lastModified": 1662111470, + "narHash": "sha256-IPyhoFZLhY8d3jHB8jyvGdbey7V+X5eCzBZYSrJ18ec=", "owner": "m-labs", "repo": "migen", - "rev": "0fb91737090fe45fd764ea3f71257a4c53c7a4ae", + "rev": "639e66f4f453438e83d86dc13491b9403bbd8ec6", "type": "github" }, "original": { @@ -181,11 +197,11 @@ "src-misoc": { "flake": false, "locked": { - "lastModified": 1649324486, - "narHash": "sha256-Mw/fQS3lHFvCm7L1k63joRkz5uyijQfywcOq+X2+o2s=", + "lastModified": 1669779825, + "narHash": "sha256-l3lyy6dmbivo9Tppb08KHSyU89ZZG1CCcSjPlNRD210=", "ref": "master", - "rev": "f1dc58d2b8c222ba41c25cee4301626625f46e43", - "revCount": 2420, + "rev": "2c255775f732a41ba1a512ab3d2547af4e25f674", + "revCount": 2435, "submodules": true, "type": "git", "url": "https://github.com/m-labs/misoc.git" @@ -222,11 +238,11 @@ ] }, "locked": { - "lastModified": 1661505762, - "narHash": "sha256-gXML1pez4LvYxuAG9AX3inKq0e7+D8SvNd/tW4OwXu4=", - "ref": "master", - "rev": "92b3f3e1dd14fb2e53868665d95bbea4270da33e", - "revCount": 621, + "lastModified": 1669819016, + "narHash": "sha256-WvNMUekL4Elc55RdqX8XP43QPnBrK8Rbd0bsoI61E5U=", + "ref": "refs/heads/master", + "rev": "67dbb5932fa8ff5f143983476f741f945871d286", + "revCount": 624, "type": "git", "url": "https://git.m-labs.hk/m-labs/zynq-rs" }, diff --git a/flake.nix b/flake.nix index 1bace75..197731a 100644 --- a/flake.nix +++ b/flake.nix @@ -12,10 +12,6 @@ rustPlatform = artiq-zynq.inputs.zynq-rs.rustPlatform; in rec { packages.x86_64-linux = rec { - migen-axi-nosys = artiqzynqpkgs.migen-axi.overrideAttrs(oa: { - patches = [ ./migen-axi-nosys.patch ]; - }); - rust-pitaya-firmware = rustPlatform.buildRustPackage { name = "rust-pitaya-firmware"; @@ -29,7 +25,7 @@ nativeBuildInputs = [ pkgs.gnumake - (pkgs.python3.withPackages(ps: [ artiqpkgs.migen migen-axi-nosys artiqpkgs.misoc ])) + (pkgs.python3.withPackages(ps: [ artiqpkgs.migen artiqpkgs.misoc artiqzynqpkgs.migen-axi ])) pkgs.cargo-xbuild pkgs.llvmPackages_9.llvm pkgs.llvmPackages_9.clang-unwrapped @@ -54,7 +50,7 @@ rust-pitaya-gateware = pkgs.runCommand "rust-pitaya-gateware" { nativeBuildInputs = [ - (pkgs.python3.withPackages(ps: [ artiqpkgs.migen migen-axi-nosys artiqpkgs.misoc ])) + (pkgs.python3.withPackages(ps: [ artiqpkgs.migen artiqpkgs.misoc artiqzynqpkgs.migen-axi ])) artiqpkgs.vivado ]; } @@ -110,7 +106,7 @@ pkgs.openocd pkgs.openssh pkgs.rsync - (pkgs.python3.withPackages(ps: [ artiqpkgs.migen self.packages.x86_64-linux.migen-axi-nosys artiqpkgs.misoc artiqzynqpkgs.artiq-netboot ])) + (pkgs.python3.withPackages(ps: [ artiqpkgs.migen artiqpkgs.misoc artiqzynqpkgs.migen-axi artiqzynqpkgs.artiq-netboot ])) artiqpkgs.vivado zynqpkgs.mkbootimage diff --git a/migen-axi-nosys.patch b/migen-axi-nosys.patch deleted file mode 100644 index 1efbd33..0000000 --- a/migen-axi-nosys.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/migen_axi/cores/ps7.py b/src/migen_axi/cores/ps7.py -index 616b65c..ee56d19 100644 ---- a/src/migen_axi/cores/ps7.py -+++ b/src/migen_axi/cores/ps7.py -@@ -396,9 +396,6 @@ class PS7(Module): - self.ddr_arb = Signal(4) - self.mio = Signal(54) - -- self.clock_domains.cd_sys = ClockDomain() -- self.clock_domains.cd_por = ClockDomain(reset_less=True) -- - self.dma0 = dmac_bus.Interface(name="dma0") - self.dma1 = dmac_bus.Interface(name="dma1") - self.dma2 = dmac_bus.Interface(name="dma2") -@@ -491,11 +488,6 @@ class PS7(Module): - ] - - self.fclk = fclk_rec() -- # fclk.reset_n considered async -- self.specials += [ -- AsyncResetSynchronizer(self.cd_sys, ~self.fclk.reset_n[0]), -- bufg([self.fclk.clk[0], ClockSignal()]), -- ] - - self.comb += self.fclk.clktrig_n.eq(0) - ftmd = ftmd_rec() diff --git a/src/gateware/rust-pitaya.py b/src/gateware/rust-pitaya.py index e783331..bc674c9 100755 --- a/src/gateware/rust-pitaya.py +++ b/src/gateware/rust-pitaya.py @@ -20,7 +20,7 @@ class RustPitaya(SoCCore): "set_property BITSTREAM.GENERAL.COMPRESS True [current_design]", ]) ident = self.__class__.__name__ - SoCCore.__init__(self, platform=platform, csr_data_width=32, ident=ident) + SoCCore.__init__(self, platform=platform, csr_data_width=32, ident=ident, ps_cd_sys=False) # Clock everything from the ADC clock clk125_pads = platform.request("clk125")