13448b8260
soc/SoCBusHandler: Integrate interconnect code since avoid duplication and simplify reuse.
...
Also extends supported data_widths.
A simple custom interconnect can now be created with code like this:
# Create 2 AXI Masters / 2 AXI Slaves.
axi_m_0 = axi.AXIInterface(data_width=32, address_width=32)
axi_m_1 = axi.AXIInterface(data_width=64, address_width=32)
axi_s_0 = axi.AXIInterface(data_width=512, address_width=32)
axi_s_1 = axi.AXIInterface(data_width=512, address_width=32)
axi_s_0_region = SoCRegion(origin=0x00000000, size=0x10000000)
axi_s_1_region = SoCRegion(origin=0x10000000, size=0x10000000)
# Create Bus Handler .
self.custom_bus = SoCBusHandler(
name = "SoCCustomBusHandler",
standard = "axi",
data_width = 512,
address_width = 32,
bursting = True,
interconnect = "crossbar",
interconnect_register = True,
)
# Add AXI Buses.
self.custom_bus.add_master(master=axi_m_0)
self.custom_bus.add_master(master=axi_m_1)
self.custom_bus.add_slave(slave=axi_s_0, region=axi_s_0_region)
self.custom_bus.add_slave(slave=axi_s_0, region=axi_s_1_region)
# Finalize.
self.custom_bus.finalize()
print(self.custom_bus)
2022-10-28 12:47:38 +02:00
3603e90ed8
integration/soc/SoC: Add collection of CSRs described in Main Module (ie Top-Level).
...
CSRs added to the Main Module were silently ignored. These are now collected and automatically
added to a "main" Sub-Module.
This feature is useful to quickly create/add CSRs in the design when debugging, ex:
# Adds a "debug" CSR to a SoC and connect register to pads:
self.debug = CSRStorage()
self.comb += pads.debug.eq(self.debug.storage).
2022-10-28 10:04:12 +02:00
1f2d4f017a
integration/soc: Switch to LiteXModule and from self.submodules/self.clock_domains to self.
2022-10-27 16:04:17 +02:00
f8702d744f
gen/common/LiteXModule: Also inherit from AutoDoc.
2022-10-27 15:52:21 +02:00
a71fd1d31b
gen/common: Introduce LiteXModule class to simplify Modules creation and avoid common mistakes.
...
LiteXModule can be used as a remplacement of Migen's Module and in this initial version:
- Automatically inherit from AutoCSR (Forgeting to inherit from AutoCSR on a Module was a common mistake).
- Simplify design creation with:
- m.module_x = .. equivalent of Migen's m.submodules.module_x = ..
- m.special_x = .. equivalent of Migen's m.specials.special_x = ..
- m.cd_x = .. equivalent of Migen's m.clock_domains.cd_x = ..
- m += module_x equivalent of Migen's m.submodules += module_x.
- m += special_x equivalent of Migen's m.specials += special_x.
- m += cd_x equivalent of Migen's m.clock_domains += cd_x.
-> Forgeting to attach a correctly a Sub-module/Special was a very common mistake and having to use
m.submodules., m.specials., m.clock_domains. was not natural.
2022-10-27 15:29:50 +02:00
e570b612b2
Merge pull request #1470 from shenki/update-microwatt
...
Update Microwatt
2022-10-26 21:10:32 -07:00
4ccf9f487d
microwatt: Fix irq variant
...
The vhd2v conversion missed some things that are only run when building
the irq variant.
Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-10-26 17:27:15 +10:30
d45d3532fe
microwatt: Update to latest
...
Add the new source files and bump the revision used.
Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-10-26 17:03:47 +10:30
f95cf6ab2d
vhd2v: Fix mixed langauge support
...
Moving to the new vhdl to verilog code broke the Vivado support where
there's no conversion required.
Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-10-26 16:29:53 +10:30
611b84ccee
build/sim/Verilator: Skip .hex in sources.
...
Useful to use platform.add_source to add/copy .hex files.
2022-10-24 18:21:10 +02:00
af445e93dd
build/vendor/common: Minor style cleanup.
2022-10-24 09:33:35 +02:00
88d89773ef
interconnect/csr: Sort by DUID even with sort=False (for retro-compatibility).
2022-10-22 09:21:37 +02:00
50acdf73a4
interconnect/csr_bus: Add missing part of the previous fix...
2022-10-21 23:06:25 +02:00
76d3a77cf3
interconnect/csr_bus: Fix build with custom get_csrs/get_constants from cores.
2022-10-21 22:01:34 +02:00
d30f780a87
fhdl/verilog: Switch tab to 4 spaces.
2022-10-21 19:49:04 +02:00
84c3e9c50e
fhdl/verilog: Make tab configurable.
2022-10-21 19:47:28 +02:00
1f58ce3c31
gen/fhdl/verilog: Improve _print_signal to align signals definition.
2022-10-21 19:39:02 +02:00
b6e672a060
fhdl/verilog: Move inline verilog attribute to previous line to improve readability of the generated verilog.
2022-10-21 19:19:28 +02:00
096f2184e6
soc/interconnect/csr: Replace level with sort and fix targets compilation.
2022-10-21 18:54:12 +02:00
14b2829a5f
Merge pull request #1467 from enjoy-digital/csr_mapping
...
Add optional support for fixed CSR mapping.
2022-10-21 18:36:26 +02:00
a60a51c52f
interconnect/csr: Only sort gathered items at Module level.
2022-10-21 16:04:23 +02:00
a57f0640cc
soc/interconnect/csr: Add optional support fixed CSR mapping.
...
By default, location is still automatically determined but it's now possible to
specific locations:
The following module:
class MyModule(Module, AutoCSR):
def __init__(self):
self.csr0 = CSRStorage()
self.csr1 = CSRStorage(n=0)
self.csr2 = CSRStorage(n=2)
built on a SoC with 32-bit CSR data-width will have the following CSR mapping:
- 0x00 : csr1
- 0x04 : csr0
- 0x08 : reserved
- 0x0c : csr2
2022-10-21 14:47:59 +02:00
804a1a5b26
soc/add_uart: Improve error message for unsupported UART.
2022-10-21 09:03:25 +02:00
73d70cf594
build/sim/platform: Remove add_csr calls no longer required.
2022-10-21 08:43:51 +02:00
525bbd19a9
Merge pull request #1465 from mohamedElbouazzati/cv32e41p_interrupts
...
Fix IRQS handling for cv32e41p
2022-10-20 16:00:39 +02:00
85e9881f45
Fix IRQS for cv32e41p
2022-10-19 17:48:36 +02:00
da8d3d10aa
tools/litex_read_verilog: Add proc step before exporting to .json since now seems to be required for some verilog designs.
2022-10-19 15:29:00 +02:00
89670e5938
soc/cores/spi: Add SPIBone import.
...
Allow importing SPIBone with:
from litex.soc.cores.spi import SPIBone
2022-10-19 15:22:04 +02:00
519b411954
core/spi/spi_bone: Update header.
2022-10-19 11:40:51 +02:00
4e8e97a22a
cores/spi/spi_bone: Cosmetic cleanups on FSM (rename states).
2022-10-19 11:40:23 +02:00
bdfb032be9
cores/spi/spi_bone: More cosmetic cleanups.
2022-10-19 11:29:03 +02:00
0b05abb44f
cores/spi/spi_bone: Rename self.wishbone to self.bus/bus.
2022-10-19 11:10:21 +02:00
b6b3ab4f11
cores/spi/spi_bone: Move Clk edges detection and rename signals (rising -> posedge, falling -> negedge).
2022-10-19 11:02:43 +02:00
710a1958a4
cores/spi/spi_bone: Separate SPI IOs handling from Signals.
2022-10-19 10:55:44 +02:00
2a15ab554a
cores/spi/spi_bone: Remove some duplicated code between 2 and 3 wires cases.
2022-10-19 10:53:26 +02:00
eabdc0b7e9
cores/spi/spi_bone: Cosmetic cleanup pass (and remove unreachable ValueErrors).
2022-10-19 10:48:13 +02:00
296fc7add0
cores/spi/spi_bone: Spi -> SPI and rename SpiWishboneBridge to SPIBone.
2022-10-19 10:37:11 +02:00
b6069a4d62
soc/cores/spi/spi_master: Remove SPISlave.
2022-10-18 18:22:33 +02:00
9f52ed1207
soc/cores/spi: Integrate SPIWishboneBridge from https://github.com/xobs/spibone .
...
"The ability to bridge Wishbone is an incredibly powerful one. However, the various bridges can be rather heavy in terms of resource usage. This presents a simple bridge that operates over SPI."
2022-10-18 18:20:50 +02:00
f5c9425e14
soc/cores/spi: Create spi directory and split spi.py in spi_master/spi_slave.
...
__init__.py provide imports compatibility.
2022-10-18 18:16:35 +02:00
f7e05b1953
interconnect/axi: Add 8-bit/16-bit data-widths.
2022-10-18 14:15:08 +02:00
838a30f148
interconnect/stream/Monitor: Add reset/latch control from logic.
...
Useful when multiple Monitors modules needs to be reseted/latched synchronously from user logic.
2022-10-18 09:21:00 +02:00
7bd0311947
interconnect/stream/Monitor: Fix packet support and cleanup.
2022-10-17 18:42:34 +02:00
b990b90c0e
soc/interconnect/stream/Monitor: Add Packets count (with configurable delimiter: first or last).
2022-10-14 20:04:48 +02:00
a03013e427
ci: Bump to ubuntu 20.04.
2022-10-14 18:21:19 +02:00
24cfbd8d67
build/efinity: Update to 2022.1.226.
2022-10-14 10:25:44 +02:00
84db6a0b3a
interconnect/axi: Add AXI version to AXIInterface (default to AXI4) and handle AXI3/AXI4 differences.
...
- Max burst length of 16 in AXI3, 256 in AXI4.
- No WID in AXI4.
2022-10-13 11:04:00 +02:00
a8070051b5
cpu/microwatt: Switch to VHD2VConverter to simplify code.
2022-10-13 09:23:20 +02:00
3e23ad3cff
build/vhd2v_converter: Fix add_sources (to make it similar to platform.add_sources).
2022-10-13 09:12:58 +02:00
808cf1a466
Merge pull request #1460 from enjoy-digital/neorv32_params
...
cpu/neorv32/core: Avoid configure_litex_core_complex by passing param…
2022-10-12 21:18:14 +02:00
Florent Kermarrec
Tim 'mithro' Ansell
Joel Stanley
mohamedElbouazzati
Sean Cross