Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1228 from sergachev/master

Browse source 
Minor fixes
This commit is contained in:
enjoy-digital 2022-02-28 11:01:02 +01:00 committed by GitHub
commit 6c93db0f14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
litex/build/tools.py
View file

@ -19,7 +19,7 @@ import datetime
def language_by_filename(name): def language_by_filename(name):
extension = name.rsplit(".")[-1] extension = name.rsplit(".")[-1]
if extension in ["v", "vh", "vo"]: if extension in ["v", "vh", "vo", "vp"]:
return "verilog" return "verilog"
elif extension in ["vhd", "vhdl", "vho"]: elif extension in ["vhd", "vhdl", "vho"]:
return "vhdl" return "vhdl"

24
litex/soc/integration/soc.py
View file

@ -122,7 +122,7 @@ class SoCBusHandler(Module):
# Check Bus Standard. # Check Bus Standard.
if standard not in self.supported_standard: if standard not in self.supported_standard:
self.logger.error("Unsupported {} {}, supporteds: {:s}".format( self.logger.error("Unsupported {} {}, supported are: {:s}".format(
colorer("Bus standard", color="red"), colorer("Bus standard", color="red"),
colorer(standard), colorer(standard),
colorer(", ".join(self.supported_standard)))) colorer(", ".join(self.supported_standard))))
@ -130,7 +130,7 @@ class SoCBusHandler(Module):
# Check Bus Data Width. # Check Bus Data Width.
if data_width not in self.supported_data_width: if data_width not in self.supported_data_width:
self.logger.error("Unsupported {} {}, supporteds: {:s}".format( self.logger.error("Unsupported {} {}, supported are: {:s}".format(
colorer("Data Width", color="red"), colorer("Data Width", color="red"),
colorer(data_width), colorer(data_width),
colorer(", ".join(str(x) for x in self.supported_data_width)))) colorer(", ".join(str(x) for x in self.supported_data_width))))
@ -138,7 +138,7 @@ class SoCBusHandler(Module):
# Check Bus Address Width. # Check Bus Address Width.
if address_width not in self.supported_address_width: if address_width not in self.supported_address_width:
self.logger.error("Unsupported {} {}, supporteds: {:s}".format( self.logger.error("Unsupported {} {}, supported are: {:s}".format(
colorer("Address Width", color="red"), colorer("Address Width", color="red"),
colorer(address_width), colorer(address_width),
colorer(", ".join(str(x) for x in self.supported_address_width)))) colorer(", ".join(str(x) for x in self.supported_address_width))))
@ -513,7 +513,7 @@ class SoCCSRHandler(SoCLocHandler):
# Check CSR Data Width. # Check CSR Data Width.
if data_width not in self.supported_data_width: if data_width not in self.supported_data_width:
self.logger.error("Unsupported {} {}, supporteds: {:s}".format( self.logger.error("Unsupported {} {}, supported are: {:s}".format(
colorer("Data Width", color="red"), colorer("Data Width", color="red"),
colorer(data_width), colorer(data_width),
colorer(", ".join(str(x) for x in self.supported_data_width)))) colorer(", ".join(str(x) for x in self.supported_data_width))))
@ -521,7 +521,7 @@ class SoCCSRHandler(SoCLocHandler):
# Check CSR Address Width. # Check CSR Address Width.
if address_width not in self.supported_address_width: if address_width not in self.supported_address_width:
self.logger.error("Unsupported {} {} supporteds: {:s}".format( self.logger.error("Unsupported {} {} supported are: {:s}".format(
colorer("Address Width", color="red"), colorer("Address Width", color="red"),
colorer(address_width), colorer(address_width),
colorer(", ".join(str(x) for x in self.supported_address_width)))) colorer(", ".join(str(x) for x in self.supported_address_width))))
@ -529,7 +529,7 @@ class SoCCSRHandler(SoCLocHandler):
# Check CSR Alignment. # Check CSR Alignment.
if alignment not in self.supported_alignment: if alignment not in self.supported_alignment:
self.logger.error("Unsupported {}: {} supporteds: {:s}".format( self.logger.error("Unsupported {}: {} supported are: {:s}".format(
colorer("Alignment", color="red"), colorer("Alignment", color="red"),
colorer(alignment), colorer(alignment),
colorer(", ".join(str(x) for x in self.supported_alignment)))) colorer(", ".join(str(x) for x in self.supported_alignment))))
@ -543,7 +543,7 @@ class SoCCSRHandler(SoCLocHandler):
# Check CSR Paging. # Check CSR Paging.
if paging not in self.supported_paging: if paging not in self.supported_paging:
self.logger.error("Unsupported {} 0x{}, supporteds: {:s}".format( self.logger.error("Unsupported {} 0x{}, supported are: {:s}".format(
colorer("Paging", color="red"), colorer("Paging", color="red"),
colorer("{:x}".format(paging)), colorer("{:x}".format(paging)),
colorer(", ".join("0x{:x}".format(x) for x in self.supported_paging)))) colorer(", ".join("0x{:x}".format(x) for x in self.supported_paging))))
@ -551,7 +551,7 @@ class SoCCSRHandler(SoCLocHandler):
# Check CSR Ordering. # Check CSR Ordering.
if ordering not in self.supported_ordering: if ordering not in self.supported_ordering:
self.logger.error("Unsupported {} {}, supporteds: {:s}".format( self.logger.error("Unsupported {} {}, supported are: {:s}".format(
colorer("Ordering", color="red"), colorer("Ordering", color="red"),
colorer("{}".format(paging)), colorer("{}".format(paging)),
colorer(", ".join("{}".format(x) for x in self.supported_ordering)))) colorer(", ".join("{}".format(x) for x in self.supported_ordering))))
@ -640,7 +640,7 @@ class SoCIRQHandler(SoCLocHandler):
# Check IRQ Number. # Check IRQ Number.
if n_irqs > 32: if n_irqs > 32:
self.logger.error("Unsupported IRQs number: {} supporteds: {:s}".format( self.logger.error("Unsupported IRQs number: {} supported are: {:s}".format(
colorer(n_irqs, color="red"), colorer("Up to 32", color="green"))) colorer(n_irqs, color="red"), colorer("Up to 32", color="green")))
raise SoCError() raise SoCError()
@ -889,7 +889,7 @@ class SoC(Module):
def add_cpu(self, name="vexriscv", variant="standard", reset_address=None, cfu=None): def add_cpu(self, name="vexriscv", variant="standard", reset_address=None, cfu=None):
# Check that CPU is supported. # Check that CPU is supported.
if name not in cpu.CPUS.keys(): if name not in cpu.CPUS.keys():
self.logger.error("{} CPU {}, supporteds: {}.".format( self.logger.error("{} CPU {}, supported are: {}.".format(
colorer(name), colorer(name),
colorer("not supported", color="red"), colorer("not supported", color="red"),
colorer(", ".join(cpu.CPUS.keys())))) colorer(", ".join(cpu.CPUS.keys()))))
@ -898,7 +898,7 @@ class SoC(Module):
# Add CPU. # Add CPU.
cpu_cls = cpu.CPUS[name] cpu_cls = cpu.CPUS[name]
if (variant not in cpu_cls.variants) and (cpu_cls is not cpu.CPUNone): if (variant not in cpu_cls.variants) and (cpu_cls is not cpu.CPUNone):
self.logger.error("{} CPU variant {}, supporteds: {}.".format( self.logger.error("{} CPU variant {}, supported are: {}.".format(
colorer(variant), colorer(variant),
colorer("not supported", color="red"), colorer("not supported", color="red"),
colorer(", ".join(cpu_cls.variants)))) colorer(", ".join(cpu_cls.variants))))
@ -1185,7 +1185,7 @@ class LiteXSoC(SoC):
"rx_fifo_depth": fifo_depth, "rx_fifo_depth": fifo_depth,
} }
if (uart_pads is None) and (uart_name not in supported_uarts): if (uart_pads is None) and (uart_name not in supported_uarts):
self.logger.error("{} UART {}, supporteds: {}.".format( self.logger.error("{} UART {}, supported are: {}.".format(
colorer(uart_name), colorer(uart_name),
colorer("not supported/found on board", color="red"), colorer("not supported/found on board", color="red"),
colorer(", ".join(supported_uarts)))) colorer(", ".join(supported_uarts))))