flake: update migen-axi

This commit was merged in pull request #391.
This commit is contained in:
2025-06-05 14:49:01 +08:00
parent 56b5240039
commit 7cad72fc39
2 changed files with 2 additions and 29 deletions

View File

@@ -66,12 +66,10 @@
src = pkgs.fetchFromGitHub {
owner = "peteut";
repo = "migen-axi";
rev = "27eaa84a70a3abfe1930c86c36c4de2cd652da35";
sha256 = "sha256-3Y9W5ns+1wbVd14iePzgSBzE+LxnGMUDtUw3BccFt80=";
rev = "98649a92ed7d4e43f75231e6ef9753e1212fab41";
sha256 = "sha256-0kEHK+l6gZW750tq89fHRxIh3Gnj5EP2GZX/neWaWzU=";
};
patches = [ ./patches/migen-axi-pr-34.patch ];
format = "pyproject";
propagatedBuildInputs = with pkgs.python3Packages; [ setuptools click numpy toolz jinja2 ramda artiqpkgs.migen artiqpkgs.misoc ];

View File

@@ -1,25 +0,0 @@
From 0fcecf94a30e0b4bbe055912f5ba3954a628cb35 Mon Sep 17 00:00:00 2001
From: morgan <mc@m-labs.hk>
Date: Fri, 30 May 2025 15:40:40 +0800
Subject: [PATCH] axi2csr: fix decoder to work with diff mem size
---
src/migen_axi/interconnect/axi2csr.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/migen_axi/interconnect/axi2csr.py b/src/migen_axi/interconnect/axi2csr.py
index 146b3c8..389abc3 100644
--- a/src/migen_axi/interconnect/axi2csr.py
+++ b/src/migen_axi/interconnect/axi2csr.py
@@ -40,6 +40,11 @@ def register_port(self, port, size):
self.specials += port
+ # to assign a unique address decoding expression for memories with different size
+ # starting address must be aligned to the size of the memory
+ padding = (size - (self._relative_addr % size)) % size
+ self._relative_addr += padding
+
# check if the remaining part of the address bus
# corresponds to the possible address
cut_addr = self._relative_addr >> 2