Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

litex_setup/ibex: add pythondata-misc-opentitan to litex_setup and use it for Ibex CPU.

This commit is contained in:
Florent Kermarrec 2021-02-17 08:07:07 +01:00
parent 285bb96278
commit 82c1f5dccb
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
litex/soc/cores/cpu/ibex/core.py
View File

@ -9,6 +9,7 @@ import os
from migen import * from migen import *
from litex import get_data_mod
from litex.soc.interconnect import wishbone from litex.soc.interconnect import wishbone
from litex.soc.cores.cpu import CPU, CPU_GCC_TRIPLE_RISCV32 from litex.soc.cores.cpu import CPU, CPU_GCC_TRIPLE_RISCV32
@ -177,10 +178,9 @@ class Ibex(CPU):
@staticmethod @staticmethod
def add_sources(platform): def add_sources(platform):
# FIXME: Create pythondata-cpu-ibex. opentitandir = get_data_mod("misc", "opentitan").data_location
os.system("git clone https://github.com/lowRISC/ibex") ibexdir = os.path.join(os.path.join(opentitandir, "hw", "vendor", "lowrisc_ibex"))
os.system("git clone https://github.com/lowRISC/opentitan") platform.add_sources(os.path.join(ibexdir, "rtl"),
platform.add_sources(os.path.join("ibex", "rtl"),
"ibex_pkg.sv", "ibex_pkg.sv",
"ibex_alu.sv", "ibex_alu.sv",
"ibex_compressed_decoder.sv", "ibex_compressed_decoder.sv",
@ -201,13 +201,13 @@ class Ibex(CPU):
"ibex_wb_stage.sv", "ibex_wb_stage.sv",
"ibex_core.sv", "ibex_core.sv",
) )
platform.add_source(os.path.join("ibex", "syn", "rtl", "prim_clock_gating.v")) platform.add_source(os.path.join(ibexdir, "syn", "rtl", "prim_clock_gating.v"))
platform.add_sources(os.path.join("opentitan", "hw", "ip", "prim", "rtl"), platform.add_sources(os.path.join(opentitandir, "hw", "ip", "prim", "rtl"),
"prim_alert_pkg.sv", "prim_alert_pkg.sv",
"prim_assert.sv" "prim_assert.sv"
) )
platform.add_verilog_include_path(os.path.join("opentitan", "hw", "ip", "prim", "rtl")) platform.add_verilog_include_path(os.path.join(opentitandir, "hw", "ip", "prim", "rtl"))
platform.add_verilog_include_path(os.path.join("ibex", "dv", "fcov")) platform.add_verilog_include_path(os.path.join(ibexdir, "dv", "fcov"))
def set_reset_address(self, reset_address): def set_reset_address(self, reset_address):
assert not hasattr(self, "reset_address") assert not hasattr(self, "reset_address")

1
litex_setup.py
View File

@ -44,6 +44,7 @@ repos = [
# Optional LiteX data # Optional LiteX data
("pythondata-misc-tapcfg", ("https://github.com/litex-hub/", False, True, None)), ("pythondata-misc-tapcfg", ("https://github.com/litex-hub/", False, True, None)),
("pythondata-misc-opentitan", ("https://github.com/litex-hub/", False, True, None)),
("pythondata-cpu-lm32", ("https://github.com/litex-hub/", False, True, None)), ("pythondata-cpu-lm32", ("https://github.com/litex-hub/", False, True, None)),
("pythondata-cpu-mor1kx", ("https://github.com/litex-hub/", False, True, None)), ("pythondata-cpu-mor1kx", ("https://github.com/litex-hub/", False, True, None)),
("pythondata-cpu-picorv32", ("https://github.com/litex-hub/", False, True, None)), ("pythondata-cpu-picorv32", ("https://github.com/litex-hub/", False, True, None)),