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

integration/soc: Simplify add_config and use it for all config parameters.

This commit is contained in:
Florent Kermarrec 2022-06-15 17:34:07 +02:00
parent 1d7aa9c438
commit f62ba0f66d
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,9 +809,6 @@ class SoC(Module):
def add_config(self, name, value=None, check_duplicate=True): def add_config(self, name, value=None, check_duplicate=True):
name = "CONFIG_" + name name = "CONFIG_" + name
if isinstance(value, str):
self.add_constant(name + "_" + value, check_duplicate=check_duplicate)
else:
self.add_constant(name, value, check_duplicate=check_duplicate) self.add_constant(name, value, check_duplicate=check_duplicate)
def check_bios_requirements(self): def check_bios_requirements(self):
@ -1024,11 +1021,11 @@ class SoC(Module):
self.cpu.add_soc_components(soc=self, soc_region_cls=SoCRegion) # FIXME: avoid passing SoCRegion. self.cpu.add_soc_components(soc=self, soc_region_cls=SoCRegion) # FIXME: avoid passing SoCRegion.
# Add constants. # Add constants.
self.add_config("CPU_TYPE", str(name)) self.add_config(f"CPU_TYPE_{name}")
self.add_config("CPU_VARIANT", str(variant.split('+')[0])) self.add_config(f"CPU_VARIANT_{str(variant.split('+')[0])}")
self.add_constant("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"):
self.add_constant("CONFIG_CPU_NOP", self.cpu.nop) self.add_config("CPU_NOP", self.cpu.nop)
def add_timer(self, name="timer0"): def add_timer(self, name="timer0"):
from litex.soc.cores.timer import Timer from litex.soc.cores.timer import Timer
@ -1086,10 +1083,10 @@ class SoC(Module):
colorer(self.bus_interconnect.__class__.__name__), colorer(self.bus_interconnect.__class__.__name__),
colorer(len(self.bus.masters)), colorer(len(self.bus.masters)),
colorer(len(self.bus.slaves)))) colorer(len(self.bus.slaves))))
self.add_constant("CONFIG_BUS_STANDARD", self.bus.standard.upper()) self.add_config("BUS_STANDARD", self.bus.standard.upper())
self.add_constant("CONFIG_BUS_DATA_WIDTH", self.bus.data_width) self.add_config("BUS_DATA_WIDTH", self.bus.data_width)
self.add_constant("CONFIG_BUS_ADDRESS_WIDTH", self.bus.address_width) self.add_config("BUS_ADDRESS_WIDTH", self.bus.address_width)
self.add_constant("CONFIG_BUS_BURSTING", int(self.bus.bursting)) self.add_config("BUS_BURSTING", int(self.bus.bursting))
# SoC DMA Bus Interconnect (Cache Coherence) ----------------------------------------------- # SoC DMA Bus Interconnect (Cache Coherence) -----------------------------------------------
if hasattr(self, "dma_bus"): if hasattr(self, "dma_bus"):
@ -1111,7 +1108,7 @@ class SoC(Module):
colorer(self.dma_bus_interconnect.__class__.__name__), colorer(self.dma_bus_interconnect.__class__.__name__),
colorer(len(self.dma_bus.masters)), colorer(len(self.dma_bus.masters)),
colorer(len(self.dma_bus.slaves)))) colorer(len(self.dma_bus.slaves))))
self.add_constant("CONFIG_CPU_HAS_DMA_BUS") self.add_config("CPU_HAS_DMA_BUS")
# SoC CSR Interconnect --------------------------------------------------------------------- # SoC CSR Interconnect ---------------------------------------------------------------------
self.submodules.csr_bankarray = csr_bus.CSRBankArray(self, self.submodules.csr_bankarray = csr_bus.CSRBankArray(self,