Gabriel Somlo [Wed, 30 Oct 2019 14:37:17 +0000 (10:37 -0400)]
cpu/rocket, soc_sdram: Connect mem_axi to LiteDRAM, bypass WB bus
Connect Rocket's dedicated port for cached RAM accesses (mem_axi)
directly to the LiteDRAM data port, bypassing the shared LiteX
(Wishbone) bus.
When both Rocket's mem_axi and LiteDRAM's port have the same data
width, use a native point-to-point AXI connection.
Otherwise, convert both ends to Wishbone, and use the Wishbone
data width converter to bridge the gap.
FIXME: In the future, this part should be replaced with a native
AXI data width converter!
Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
Florent Kermarrec [Fri, 1 Nov 2019 10:33:43 +0000 (11:33 +0100)]
interconnect/csr_bus/SRAM: add mem_size check
Memory size is limited to 512 bytes:
- CSR region size is 0x800 (4096)
- default csr_data_width is 8
maximum size = 4096/8 = 512 bytes.
Florent Kermarrec [Fri, 1 Nov 2019 10:30:50 +0000 (11:30 +0100)]
soc_core/soc_core_args: specify default cpu (vexriscv)
Florent Kermarrec [Fri, 1 Nov 2019 09:11:12 +0000 (10:11 +0100)]
lattice/diamond/tcl: always use / separators, even on windows
Florent Kermarrec [Fri, 1 Nov 2019 08:25:02 +0000 (09:25 +0100)]
cpu/minerva: elaborate minerva verilog to build directory
Florent Kermarrec [Fri, 1 Nov 2019 08:23:42 +0000 (09:23 +0100)]
soc/integration/builder: pass output_dir to platform, make sure gateware/software directory are created before finalizing
Florent Kermarrec [Thu, 31 Oct 2019 20:15:12 +0000 (21:15 +0100)]
cpu/minerva: generate minerva.v near core.py not in submodule
Florent Kermarrec [Thu, 31 Oct 2019 07:52:04 +0000 (08:52 +0100)]
cpu/minverva: give more explicit error message when not able to elaborate cpu
Tim Ansell [Thu, 31 Oct 2019 03:49:27 +0000 (20:49 -0700)]
Merge pull request #297 from mithro/mem-region-pp
Improve the error message on memory region conflict.
Tim 'mithro' Ansell [Thu, 31 Oct 2019 02:32:20 +0000 (19:32 -0700)]
Improve the error message on memory region conflict.
Before;
```
ValueError: Memory region conflict between rom and main_ram
```
After;
```
ValueError: Memory region conflict between rom (<SoCMemRegion 0x10000000 0x10000 cached>) and main_ram (<SoCMemRegion 0x0 0x20000000 cached>)
```
Fixes #296.
Tim Ansell [Wed, 30 Oct 2019 21:28:48 +0000 (14:28 -0700)]
Merge pull request #293 from mithro/mor1kx-fix
Fix file names for the mor1kx processor.
Tim 'mithro' Ansell [Wed, 30 Oct 2019 20:49:24 +0000 (13:49 -0700)]
Fix file names for the mor1kx processor.
Fixes #292.
Florent Kermarrec [Wed, 30 Oct 2019 15:33:40 +0000 (16:33 +0100)]
targets: use type="io" instead of io_region=True
Florent Kermarrec [Wed, 30 Oct 2019 15:31:27 +0000 (16:31 +0100)]
integration/SoCMemRegion: use type instead of io_region/linker_region and export type to csv/json
Supported types: "cached", "io", "cached+linker", "io+linker", default="cached"
Florent Kermarrec [Mon, 28 Oct 2019 17:32:28 +0000 (18:32 +0100)]
soc_core: add check_regions_overlap method, add linker_region support (overlap is not checked on linker_regions)
Florent Kermarrec [Mon, 28 Oct 2019 16:07:37 +0000 (17:07 +0100)]
soc_core/add_memory_region: fix memory overlap detection
Florent Kermarrec [Mon, 28 Oct 2019 09:59:43 +0000 (10:59 +0100)]
test/test_targets: skip Minerva test on Travis-CI, remove commented tests
Florent Kermarrec [Mon, 28 Oct 2019 09:22:17 +0000 (10:22 +0100)]
cpu/minerva: elaborate from nmigen sources during build, enable hardware multiplier
enjoy-digital [Fri, 25 Oct 2019 10:28:29 +0000 (12:28 +0200)]
Merge pull request #286 from gsomlo/gls-timingstrict
build/lattice/trellis: optionally allow failure if p&r timing not met
Gabriel Somlo [Thu, 24 Oct 2019 17:56:20 +0000 (13:56 -0400)]
build/lattice/trellis: optionally allow failure if p&r timing not met
When timing requirements are strict, allow the build process to fail upon
failure to meet timing. This facilitates running the build process from a
loop, repeatedly, until a "lucky" p&r solution is found, e.g.:
while true; do
litex/boards/targets/versa_ecp5.py --gateware-toolchain trellis \
--sys-clk-freq=60e06 --cpu-type rocket --cpu-variant linux \
--with-ethernet --yosys-nowidelut \
--nextpnr-timingstrict
if [ "$?" == "0" ]; then
echo "Success" | mail -s "Build Succeeded" your@email.here
break
fi
done
This augments commit #
683e0668, which unconditionally forced p&r to
succeed, regardless of whether timing was met, via '--timing-allow-fail'.
Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
enjoy-digital [Sun, 20 Oct 2019 13:30:22 +0000 (15:30 +0200)]
Merge pull request #283 from kbeckmann/kbeckmann/bios_increment_address
bios: Increment address when writing to flash
Konrad Beckmann [Sat, 19 Oct 2019 20:58:24 +0000 (22:58 +0200)]
bios: Increment address when writing to flash
Florent Kermarrec [Fri, 18 Oct 2019 12:12:01 +0000 (14:12 +0200)]
build/lattice/trellis: use --timing-allow-fail to allow generating bistream when timings are not met
This is the default behaviour of the others tools and allow testing designs on hardware with small violations.
Florent Kermarrec [Fri, 18 Oct 2019 08:26:47 +0000 (10:26 +0200)]
soc/cores/icap/ICAPBitstream: always keep fifo.source.ready to 1
enjoy-digital [Fri, 18 Oct 2019 08:24:20 +0000 (10:24 +0200)]
Merge pull request #282 from antmicro/icapbitstream_fixes
Fix ICAPBitstream
Jan Kowalewski [Fri, 18 Oct 2019 07:33:31 +0000 (09:33 +0200)]
cores/icap/ICAPBitstream: add source ready signal.
Florent Kermarrec [Thu, 17 Oct 2019 10:44:16 +0000 (12:44 +0200)]
soc/integration/__init__: remove imports (not used and causing issues
Florent Kermarrec [Thu, 17 Oct 2019 10:13:06 +0000 (12:13 +0200)]
build: always use platform.add_source and avoid manipulate platform.sources directly
Florent Kermarrec [Thu, 17 Oct 2019 07:52:31 +0000 (09:52 +0200)]
build/generic_platform: replace set with list for sources/verilog_include_paths
Python does not have native OrderedSet and we need to be able to preserve the order of the sources
for some backends (Verilator for instance), so use list instead of set.
Florent Kermarrec [Wed, 16 Oct 2019 12:56:17 +0000 (14:56 +0200)]
cores/icap/ICAPBitstream: simplify, add icap_clk_div parameter, describe how to use it.
Florent Kermarrec [Tue, 15 Oct 2019 10:13:42 +0000 (12:13 +0200)]
build/generic_platform: keep language to None if None after tools.language_by_filename
Florent Kermarrec [Mon, 14 Oct 2019 20:15:02 +0000 (22:15 +0200)]
soc_core: fix default --uart_name
Florent Kermarrec [Mon, 14 Oct 2019 07:12:25 +0000 (09:12 +0200)]
integration/soc_core: expose more SoC parameters
Tim Ansell [Sun, 13 Oct 2019 18:29:46 +0000 (11:29 -0700)]
Merge pull request #280 from kbeckmann/picorv32_typo
picorv32: Fix minimal variant params
Konrad Beckmann [Sun, 13 Oct 2019 10:56:55 +0000 (12:56 +0200)]
picorv32: Fix minimal variant params
The param p_ENABLE_COUNTERS was misspelled.
Florent Kermarrec [Sat, 12 Oct 2019 21:05:53 +0000 (23:05 +0200)]
soc_core: fix soc_core_argdict
Florent Kermarrec [Sat, 12 Oct 2019 17:20:50 +0000 (19:20 +0200)]
cpu/lm32: add missing buses
Florent Kermarrec [Sat, 12 Oct 2019 17:18:57 +0000 (19:18 +0200)]
soc_core/soc_core_argdict: use inspect to get all parameters and simplify
Florent Kermarrec [Fri, 11 Oct 2019 19:55:26 +0000 (21:55 +0200)]
integration: simplify cpu buses auto-conversion (always use Converter, thanks gsomlo)
Florent Kermarrec [Fri, 11 Oct 2019 19:49:11 +0000 (21:49 +0200)]
interconnect/wishbone: fix Converter case when buses are identical
Florent Kermarrec [Fri, 11 Oct 2019 12:28:29 +0000 (14:28 +0200)]
platforms/versa_ecp5: add serdes refclk/sma
Florent Kermarrec [Fri, 11 Oct 2019 07:01:50 +0000 (09:01 +0200)]
cpu/rocket: expose 64-bit buses (use automatic down-conversion of SoCCore)
Florent Kermarrec [Fri, 11 Oct 2019 06:59:25 +0000 (08:59 +0200)]
soc_core: add automatic down-conversion of CPU buses to 32-bit (if needed)
Florent Kermarrec [Fri, 11 Oct 2019 06:41:05 +0000 (08:41 +0200)]
soc/interconnect/axi: re-align to improve readability
Florent Kermarrec [Fri, 11 Oct 2019 06:38:12 +0000 (08:38 +0200)]
software/bios: simplify banners
Florent Kermarrec [Thu, 10 Oct 2019 20:29:54 +0000 (22:29 +0200)]
cpu/picorv32: remove obsolete comment
Florent Kermarrec [Thu, 10 Oct 2019 20:02:04 +0000 (22:02 +0200)]
cpu/picorv32: use a single idbus
Florent Kermarrec [Thu, 10 Oct 2019 19:52:09 +0000 (21:52 +0200)]
cpu: cleanup/re-align
Florent Kermarrec [Thu, 10 Oct 2019 19:40:29 +0000 (21:40 +0200)]
cpu/rocket: rename ibus/dbus to mem_wb/mmio_wb and add size suffix
Florent Kermarrec [Thu, 10 Oct 2019 19:35:06 +0000 (21:35 +0200)]
cpu: add buses list and use it in soc_core to add bus masters
Florent Kermarrec [Thu, 10 Oct 2019 19:15:49 +0000 (21:15 +0200)]
integration: move soc constants to soc.h of csr.h
software retro-compat with soc.h included in csr.h
Florent Kermarrec [Thu, 10 Oct 2019 17:39:33 +0000 (19:39 +0200)]
build/generic_platform: only add sources if language is not None
Florent Kermarrec [Thu, 10 Oct 2019 17:36:17 +0000 (19:36 +0200)]
xilinx/vivado: replace "xy" == language with language == "xy"
enjoy-digital [Thu, 10 Oct 2019 17:31:09 +0000 (19:31 +0200)]
Merge pull request #277 from railnova/feature/vivado_sysverilog_support
[feature] Add SystemVerilog support for the Vivado builder
Florent Kermarrec [Thu, 10 Oct 2019 17:23:01 +0000 (19:23 +0200)]
integration/soc_zynq: shadow_base no longer recommended (replace with io_regions)
Florent Kermarrec [Thu, 10 Oct 2019 17:21:32 +0000 (19:21 +0200)]
bios/main: use same banner than README (MiSoC cited in README/LICENSE)
Florent Kermarrec [Thu, 10 Oct 2019 17:18:28 +0000 (19:18 +0200)]
software/bios: don't show peripherals init banner if nothing to init, add Ethernet init printf
Martin Cornil [Thu, 10 Oct 2019 12:06:37 +0000 (14:06 +0200)]
Add system Verilog support for the Vivado builder
enjoy-digital [Wed, 9 Oct 2019 19:25:57 +0000 (21:25 +0200)]
Merge pull request #276 from gsomlo/gls-rocket-map
cpu/rocket: swap main_mem and io regions
Gabriel Somlo [Wed, 9 Oct 2019 18:25:41 +0000 (14:25 -0400)]
cpu/rocket: swap main_mem and io regions
The total size of RAM (main_mem) can be expected to vary significantly,
and often exceed the size needed for MMIO allocations by a large margin.
As such, place Rocket's MMIO (io regions) below 0x8000_0000, and start
the RAM (main_mem) at 0x8000_0000, with nothing above it to limit its
future growth.
Also, bump the pre-built Rocket verilog submodule to an updated version,
which also comes with matching changes to the way MMIO and RAM accesses
are mapped and routed to their respective AXI interfaces.
Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
Florent Kermarrec [Wed, 9 Oct 2019 10:05:10 +0000 (12:05 +0200)]
cpu: add default io_regions to CPUNone (all address range can be used as IO)
enjoy-digital [Wed, 9 Oct 2019 09:20:50 +0000 (11:20 +0200)]
Merge pull request #275 from pcotret/patch-1
Update README (related to issue #273)
Florent Kermarrec [Wed, 9 Oct 2019 08:47:19 +0000 (10:47 +0200)]
soc_core: improve check_io_region error message
Florent Kermarrec [Wed, 9 Oct 2019 08:38:22 +0000 (10:38 +0200)]
targets/sim: switch from shadow_base to io_regions
Florent Kermarrec [Wed, 9 Oct 2019 08:24:01 +0000 (10:24 +0200)]
cpu/rocket: move csr to IO region
Florent Kermarrec [Wed, 9 Oct 2019 08:19:18 +0000 (10:19 +0200)]
build/xilinx/vivado: fix default synth-mode
Florent Kermarrec [Wed, 9 Oct 2019 08:14:14 +0000 (10:14 +0200)]
soc_core/cpu: add io_regions and deprecate shadow_base (with API retro-compat)
The shadow_base parameter has always been difficult to apprehend, replace it with
io_regions (uncached regions) defined user or the CPU.
The equivalent of a shadow_base parameter of 0x80000000 in the old API is:
io_regions = {0x80000000: 0x80000000} # origin, length
It's still possible to use shadow_base with retro-compat, but user is encouraged
to update and features will be removed in the future.
Pascal Cotret [Wed, 9 Oct 2019 07:48:32 +0000 (09:48 +0200)]
Update README (related to issue #273)
Following my problems with the quick start guide (issue #273), I suggest a few modifications to have a "real" quick start guide.
enjoy-digital [Tue, 8 Oct 2019 19:15:54 +0000 (21:15 +0200)]
Merge pull request #274 from gsomlo/gls-shadow-base
builder: use the SoC's existing shadow base with get_csr_header()
Gabriel Somlo [Tue, 8 Oct 2019 18:28:50 +0000 (14:28 -0400)]
builder: use the SoC's existing shadow base with get_csr_header()
Both the SoC and get_csr_header() have independently set defaults
for the value of 'shadow_base'. If the SoC's value was modified,
ensure that get_csr_header() uses the modified value instead of
its own default.
Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Florent Kermarrec [Mon, 7 Oct 2019 08:38:26 +0000 (10:38 +0200)]
targets/arty: allow setting synth-mode to yosys with command line: --synth-mode=yosys
Florent Kermarrec [Mon, 7 Oct 2019 08:37:16 +0000 (10:37 +0200)]
build/xilinx/vivado: add vivado_build_args/vivado_build_argdict for yosys synthesis mode
Florent Kermarrec [Mon, 7 Oct 2019 08:36:32 +0000 (10:36 +0200)]
xilinx/common: be sure language is not vhdl when yosys synthesis is used
Florent Kermarrec [Mon, 7 Oct 2019 06:49:32 +0000 (08:49 +0200)]
cpu/vexriscv: use specific mem_map for linux variant
enjoy-digital [Sun, 6 Oct 2019 12:55:44 +0000 (14:55 +0200)]
Merge pull request #271 from gsomlo/gls-yosys-nowidelut
RFC: optional '-nowidelut' flag for yosys synth_ecp5
Gabriel L. Somlo [Thu, 8 Aug 2019 22:55:14 +0000 (18:55 -0400)]
trellis, versa_ecp5: optional '-nowidelut' flag for yosys synth_ecp5
Passing '-nowidelut' to yosys' synth_ecp5 command improves area utilization
to the point where a (linux variant) rocket-chip based design will fit on a
versa_ecp5 board. Usually '-nowidelut' incurs a timing penalty, but that is
then mitigated by using DSP inference (enabled by default from yosys commit
8474c5b3).
Off by default, this flag can be enabled by adding '--yosys-nowidelut=True'
to the litex/boards/targets/versa_ecp5.py command line.
Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
enjoy-digital [Sun, 6 Oct 2019 10:10:19 +0000 (12:10 +0200)]
Merge pull request #272 from sergachev/fix-comments
fix comments in icap.py
Ilia Sergachev [Sun, 6 Oct 2019 08:47:28 +0000 (10:47 +0200)]
fix comments
Florent Kermarrec [Fri, 4 Oct 2019 08:00:45 +0000 (10:00 +0200)]
litex_setup: add litejesd204b
enjoy-digital [Tue, 1 Oct 2019 19:40:56 +0000 (21:40 +0200)]
Merge pull request #270 from gsomlo/gls-csr-upper
soc/integration: ensure CSR constants are in uppercase
Florent Kermarrec [Tue, 1 Oct 2019 19:30:14 +0000 (21:30 +0200)]
soc/cores/icap: simplify ICAPBitstream (untested)
Florent Kermarrec [Tue, 1 Oct 2019 19:04:49 +0000 (21:04 +0200)]
soc/cores/icap: rename ICAP to ICAPBistream and revert old ICAP
enjoy-digital [Tue, 1 Oct 2019 18:55:28 +0000 (20:55 +0200)]
Merge pull request #269 from antmicro/rework_icap
soc: cores: support sending custom bitstream to ICAP
Gabriel Somlo [Tue, 1 Oct 2019 16:14:33 +0000 (12:14 -0400)]
soc/integration: ensure CSR constants are in uppercase
Fixup over commit
8be5824e.
Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
Jan Kowalewski [Tue, 17 Sep 2019 19:35:53 +0000 (21:35 +0200)]
soc: cores: support sending custom bitstream to ICAP
This adds FIFO that can be used to send any
sequence of commands to the ICAP controller.
Florent Kermarrec [Mon, 30 Sep 2019 21:31:34 +0000 (23:31 +0200)]
soc/interconnect: rename stream_packet to packet & cleanup (with retro-compat)
Florent Kermarrec [Mon, 30 Sep 2019 21:18:39 +0000 (23:18 +0200)]
soc/interconnect/stream: add separators, mode Actor modules just after Endpoint
Florent Kermarrec [Mon, 30 Sep 2019 14:00:11 +0000 (16:00 +0200)]
soc_zynq: update get_csr_header
Florent Kermarrec [Mon, 30 Sep 2019 09:32:07 +0000 (11:32 +0200)]
soc/integration: move cpu_interface retro-compatibility to litex/__init__
Florent Kermarrec [Mon, 30 Sep 2019 08:59:36 +0000 (10:59 +0200)]
soc/integration: use dicts for constants/mem_regions/csr_regions to cleanup/simplify iterations on theses
Florent Kermarrec [Mon, 30 Sep 2019 06:30:45 +0000 (08:30 +0200)]
cpu: remove initial SERV support (we'll work in a branch to experiment with it)
Florent Kermarrec [Mon, 30 Sep 2019 06:26:38 +0000 (08:26 +0200)]
soc_core: fix cpu_type=None case and add test for it
Florent Kermarrec [Sun, 29 Sep 2019 15:33:16 +0000 (17:33 +0200)]
soc_sdram: remove axi usecase, this was only useful to do some preliminary axi tests.
Proper AXI support will be added in the future for SoCs.
Florent Kermarrec [Sun, 29 Sep 2019 15:31:37 +0000 (17:31 +0200)]
soc_core: cleanup/re-align
Florent Kermarrec [Sun, 29 Sep 2019 15:23:01 +0000 (17:23 +0200)]
soc/integration: rename cpu_interface to export (with retro-compat), re-arrange a bit, add separators
Florent Kermarrec [Sun, 29 Sep 2019 15:12:15 +0000 (17:12 +0200)]
test/test_targets: update cpu-type to mor1kx
Florent Kermarrec [Sun, 29 Sep 2019 15:04:21 +0000 (17:04 +0200)]
soc/cores: uniformize (continue)
Florent Kermarrec [Sun, 29 Sep 2019 14:10:44 +0000 (16:10 +0200)]
soc/cores/gpio: uniformize with others cores
Florent Kermarrec [Sun, 29 Sep 2019 14:08:39 +0000 (16:08 +0200)]
soc/cores: rename frequency_meter to freqmeter and uniformize with others cores
Florent Kermarrec [Sun, 29 Sep 2019 14:02:04 +0000 (16:02 +0200)]
soc/cores/ecc: improve readibility, uniformize with others cores