Merge pull request #1818 from Dolu1990/nax-smp
core/naxriscv update to main branch
This commit is contained in:
commit
5842ad7d14
|
@ -165,8 +165,8 @@ class NaxRiscv(CPU):
|
||||||
# CPU Instance.
|
# CPU Instance.
|
||||||
self.cpu_params = dict(
|
self.cpu_params = dict(
|
||||||
# Clk/Rst.
|
# Clk/Rst.
|
||||||
i_clk = ClockSignal("sys"),
|
i_socClk = ClockSignal("sys"),
|
||||||
i_reset = ResetSignal("sys") | self.reset,
|
i_asyncReset = ResetSignal("sys") | self.reset,
|
||||||
|
|
||||||
o_patcher_tracer_valid=self.tracer_valid,
|
o_patcher_tracer_valid=self.tracer_valid,
|
||||||
o_patcher_tracer_payload=self.tracer_payload,
|
o_patcher_tracer_payload=self.tracer_payload,
|
||||||
|
@ -308,8 +308,7 @@ class NaxRiscv(CPU):
|
||||||
sdir = os.path.join(vdir, "ext", "SpinalHDL")
|
sdir = os.path.join(vdir, "ext", "SpinalHDL")
|
||||||
|
|
||||||
if NaxRiscv.update_repo != "no":
|
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", "main", "b6d0712f" 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 = []
|
gen_args = []
|
||||||
gen_args.append(f"--netlist-name={NaxRiscv.netlist_name}")
|
gen_args.append(f"--netlist-name={NaxRiscv.netlist_name}")
|
||||||
|
|
Loading…
Reference in New Issue