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

soc/integration: Generate CPU_FAMILY config and use it to simplify litex_json2dts_linux.py.

This commit is contained in:
Florent Kermarrec 2024-06-13 09:33:04 +02:00
parent 962bd67431
commit abdf6d3ee7
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
litex/soc/integration/soc.py
View File

@ -1287,6 +1287,7 @@ class SoC(LiteXModule, SoCCoreCompat):
# Add constants. # Add constants.
self.add_config(f"CPU_TYPE_{name}") self.add_config(f"CPU_TYPE_{name}")
self.add_config(f"CPU_VARIANT_{str(variant.split('+')[0])}") self.add_config(f"CPU_VARIANT_{str(variant.split('+')[0])}")
self.add_config("CPU_FAMILY", getattr(self.cpu, "family", "Unknown"))
self.add_config("CPU_NAME", getattr(self.cpu, "name", "Unknown")) self.add_config("CPU_NAME", getattr(self.cpu, "name", "Unknown"))
self.add_config("CPU_HUMAN_NAME", getattr(self.cpu, "human_name", "Unknown")) self.add_config("CPU_HUMAN_NAME", getattr(self.cpu, "human_name", "Unknown"))
if hasattr(self.cpu, "nop"): if hasattr(self.cpu, "nop"):

33
litex/tools/litex_json2dts_linux.py
View File

@ -18,22 +18,11 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
aliases = {} aliases = {}
# CPU Architectures ----------------------------------------------------------------------------
# CHECKME: Move to core and generate a constant for each CPU?
cpu_architectures = {
"mor1kx" : "or1k",
"marocchino" : "or1k",
"vexriscv" : "riscv",
"vexiiriscv" : "riscv",
"rocket" : "riscv",
"naxriscv" : "riscv",
}
# CPU Parameters ------------------------------------------------------------------------------- # CPU Parameters -------------------------------------------------------------------------------
cpu_count = int(d["constants"].get("config_cpu_count", 1)) cpu_count = int(d["constants"].get("config_cpu_count", 1))
cpu_name = d["constants"].get("config_cpu_name") cpu_name = d["constants"].get("config_cpu_name")
cpu_arch = cpu_architectures[cpu_name] cpu_family = d["constants"].get("config_cpu_family")
cpu_isa = d["constants"].get("config_cpu_isa", None) # kernel < 6.6.0 cpu_isa = d["constants"].get("config_cpu_isa", None) # kernel < 6.6.0
# kernel >= 6.6.0 # kernel >= 6.6.0
cpu_isa_base = cpu_isa[:5] cpu_isa_base = cpu_isa[:5]
@ -81,7 +70,7 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
if initrd_start is None: if initrd_start is None:
initrd_start = default_initrd_start[cpu_arch] initrd_start = default_initrd_start[cpu_family]
if initrd_size is None: if initrd_size is None:
initrd_size = default_initrd_size initrd_size = default_initrd_size
@ -142,7 +131,7 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
# RISC-V # RISC-V
# ------ # ------
if cpu_arch == "riscv": if cpu_family == "riscv":
# Cache description. # Cache description.
cache_desc = "" cache_desc = ""
if "config_cpu_dcache_size" in d["constants"]: if "config_cpu_dcache_size" in d["constants"]:
@ -252,7 +241,7 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
# Or1k # Or1k
# ---- # ----
elif cpu_arch == "or1k": elif cpu_family == "or1k":
dts += """ dts += """
cpus {{ cpus {{
#address-cells = <1>; #address-cells = <1>;
@ -339,7 +328,7 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
# Interrupt Controller ------------------------------------------------------------------------- # Interrupt Controller -------------------------------------------------------------------------
if (cpu_arch == "riscv") and (cpu_name in ["rocket", "vexiiriscv"]): if (cpu_family == "riscv") and (cpu_name in ["rocket", "vexiiriscv"]):
# FIXME : L4 definitiion? # FIXME : L4 definitiion?
# CHECKME: interrupts-extended. # CHECKME: interrupts-extended.
dts += """ dts += """
@ -353,7 +342,7 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
""".format( """.format(
clint_base=d["memories"]["clint"]["base"], clint_base=d["memories"]["clint"]["base"],
cpu_mapping =("\n" + " "*20).join(["&L{} 3 &L{} 7".format(cpu, cpu) for cpu in range(cpu_count)])) cpu_mapping =("\n" + " "*20).join(["&L{} 3 &L{} 7".format(cpu, cpu) for cpu in range(cpu_count)]))
if cpu_arch == "riscv": if cpu_family == "riscv":
if cpu_name == "rocket": if cpu_name == "rocket":
extra_attr = """ extra_attr = """
reg-names = "control"; reg-names = "control";
@ -379,7 +368,7 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
cpu_mapping =("\n" + " "*20).join(["&L{} 11 &L{} 9".format(cpu, cpu) for cpu in range(cpu_count)]), cpu_mapping =("\n" + " "*20).join(["&L{} 11 &L{} 9".format(cpu, cpu) for cpu in range(cpu_count)]),
extra_attr =extra_attr) extra_attr =extra_attr)
elif cpu_arch == "or1k": elif cpu_family == "or1k":
dts += """ dts += """
intc0: interrupt-controller { intc0: interrupt-controller {
interrupt-controller; interrupt-controller;
@ -388,7 +377,7 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
status = "okay"; status = "okay";
}; };
""" """
if (cpu_arch == "riscv") and (cpu_name == "rocket"): if (cpu_family == "riscv") and (cpu_name == "rocket"):
dts += """ dts += """
dbg_ctl: debug-controller@0 {{ dbg_ctl: debug-controller@0 {{
compatible = "sifive,debug-013", "riscv,debug-013"; compatible = "sifive,debug-013", "riscv,debug-013";