From 12f87212e385e214ad7d1a8bac93aaf5a282ff1c Mon Sep 17 00:00:00 2001 From: Dolu1990 Date: Thu, 12 Oct 2023 15:15:51 +0200 Subject: [PATCH 1/2] core/naxriscv fix l2 parameters --- litex/soc/cores/cpu/naxriscv/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litex/soc/cores/cpu/naxriscv/core.py b/litex/soc/cores/cpu/naxriscv/core.py index 77df32be3..071936e03 100755 --- a/litex/soc/cores/cpu/naxriscv/core.py +++ b/litex/soc/cores/cpu/naxriscv/core.py @@ -308,7 +308,7 @@ class NaxRiscv(CPU): sdir = os.path.join(vdir, "ext", "SpinalHDL") if NaxRiscv.update_repo != "no": - NaxRiscv.git_setup("NaxRiscv", ndir, "https://github.com/SpinalHDL/NaxRiscv.git", "coherency", "2948aa4d" if NaxRiscv.update_repo=="recommended" else None) + NaxRiscv.git_setup("NaxRiscv", ndir, "https://github.com/SpinalHDL/NaxRiscv.git", "coherency", "9e44c1b6" if NaxRiscv.update_repo=="recommended" else None) NaxRiscv.git_setup("SpinalHDL", sdir, "https://github.com/SpinalHDL/SpinalHDL.git", "bus-fabric" , "74c5d7de" if NaxRiscv.update_repo=="recommended" else None) gen_args = [] From 5e482d641c18bb942ce8b58eb8b60fd403a76b14 Mon Sep 17 00:00:00 2001 From: Dolu1990 Date: Fri, 27 Oct 2023 16:06:07 +0200 Subject: [PATCH 2/2] core/naxriscv switch to main branch, and implement a reset controller internaly --- litex/soc/cores/cpu/naxriscv/core.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/litex/soc/cores/cpu/naxriscv/core.py b/litex/soc/cores/cpu/naxriscv/core.py index 071936e03..7b00721b0 100755 --- a/litex/soc/cores/cpu/naxriscv/core.py +++ b/litex/soc/cores/cpu/naxriscv/core.py @@ -165,8 +165,8 @@ class NaxRiscv(CPU): # CPU Instance. self.cpu_params = dict( # Clk/Rst. - i_clk = ClockSignal("sys"), - i_reset = ResetSignal("sys") | self.reset, + i_socClk = ClockSignal("sys"), + i_asyncReset = ResetSignal("sys") | self.reset, o_patcher_tracer_valid=self.tracer_valid, o_patcher_tracer_payload=self.tracer_payload, @@ -308,8 +308,7 @@ class NaxRiscv(CPU): sdir = os.path.join(vdir, "ext", "SpinalHDL") if NaxRiscv.update_repo != "no": - NaxRiscv.git_setup("NaxRiscv", ndir, "https://github.com/SpinalHDL/NaxRiscv.git", "coherency", "9e44c1b6" if NaxRiscv.update_repo=="recommended" else None) - NaxRiscv.git_setup("SpinalHDL", sdir, "https://github.com/SpinalHDL/SpinalHDL.git", "bus-fabric" , "74c5d7de" if NaxRiscv.update_repo=="recommended" else None) + NaxRiscv.git_setup("NaxRiscv", ndir, "https://github.com/SpinalHDL/NaxRiscv.git", "main", "b6d0712f" if NaxRiscv.update_repo=="recommended" else None) gen_args = [] gen_args.append(f"--netlist-name={NaxRiscv.netlist_name}")