litex.git
4 years agosoc/add_sdram: avoid L2 cache when l2_cache_size == 0.
Florent Kermarrec [Mon, 10 Feb 2020 18:02:44 +0000 (19:02 +0100)]
soc/add_sdram: avoid L2 cache when l2_cache_size == 0.

4 years agosoc: remove unneeded \n
Florent Kermarrec [Mon, 10 Feb 2020 17:38:59 +0000 (18:38 +0100)]
soc: remove unneeded \n

4 years agotools/litex_sim_new: use new bus/csr/irq methods
Florent Kermarrec [Mon, 10 Feb 2020 17:21:41 +0000 (18:21 +0100)]
tools/litex_sim_new: use new bus/csr/irq methods

4 years agosoc: use io_regions for alloc_region
Florent Kermarrec [Mon, 10 Feb 2020 17:19:35 +0000 (18:19 +0100)]
soc: use io_regions for alloc_region

4 years agotools: add litex_sim_new based on SoCCore and using add_sdram method
Florent Kermarrec [Mon, 10 Feb 2020 17:00:46 +0000 (18:00 +0100)]
tools: add litex_sim_new based on SoCCore and using add_sdram method

4 years agosoc_core: use add_rom
Florent Kermarrec [Mon, 10 Feb 2020 16:43:29 +0000 (17:43 +0100)]
soc_core: use add_rom

4 years agosoc/add_cpu: simplify CPUNone integration
Florent Kermarrec [Mon, 10 Feb 2020 16:40:46 +0000 (17:40 +0100)]
soc/add_cpu: simplify CPUNone integration

4 years agosoc/SoCBusHandler: add add_adapter method and use it to convert Master/Slave before...
Florent Kermarrec [Mon, 10 Feb 2020 16:17:31 +0000 (17:17 +0100)]
soc/SoCBusHandler: add add_adapter method and use it to convert Master/Slave before connecting to the Bus

4 years agosoc/add_sdram: add sdram csr
Florent Kermarrec [Mon, 10 Feb 2020 16:02:20 +0000 (17:02 +0100)]
soc/add_sdram: add sdram csr

4 years agosoc/add_sdram: fix rocket, shorten comments
Florent Kermarrec [Mon, 10 Feb 2020 15:55:15 +0000 (16:55 +0100)]
soc/add_sdram: fix rocket, shorten comments

4 years agosoc/add_sdram: improve API
Florent Kermarrec [Mon, 10 Feb 2020 15:38:20 +0000 (16:38 +0100)]
soc/add_sdram: improve API

4 years agosoc: add LiteXSoC class and mode add_identifier/uart/sdram to it
Florent Kermarrec [Mon, 10 Feb 2020 15:28:11 +0000 (16:28 +0100)]
soc: add LiteXSoC class and mode add_identifier/uart/sdram to it

4 years agosoc_core/sdram: cleanup, add disclaimer
Florent Kermarrec [Mon, 10 Feb 2020 15:21:21 +0000 (16:21 +0100)]
soc_core/sdram: cleanup, add disclaimer

4 years agosoc: add add_sdram
Florent Kermarrec [Mon, 10 Feb 2020 15:01:19 +0000 (16:01 +0100)]
soc: add add_sdram

4 years agosoc: add csr_regions, update copyright
Florent Kermarrec [Mon, 10 Feb 2020 14:10:08 +0000 (15:10 +0100)]
soc: add csr_regions, update copyright

4 years agosoc: add cpu rom/sram check
Florent Kermarrec [Mon, 10 Feb 2020 13:48:46 +0000 (14:48 +0100)]
soc: add cpu rom/sram check

4 years agosoc: add SOCIORegion and manage it
Florent Kermarrec [Mon, 10 Feb 2020 13:35:36 +0000 (14:35 +0100)]
soc: add SOCIORegion and manage it

4 years agosoc: reorder main components/peripherals
Florent Kermarrec [Mon, 10 Feb 2020 12:07:09 +0000 (13:07 +0100)]
soc: reorder main components/peripherals

4 years agosoc: add add_cpu method
Florent Kermarrec [Sun, 9 Feb 2020 20:56:32 +0000 (21:56 +0100)]
soc: add add_cpu method

4 years ago.gitmodules/black-parrot: switch to https://github.com/enjoy-digital/black-parrot...
Florent Kermarrec [Sun, 9 Feb 2020 18:53:04 +0000 (19:53 +0100)]
.gitmodules/black-parrot: switch to https://github.com/enjoy-digital/black-parrot (without the submodules)

4 years agosoc: fix unit-tests
Florent Kermarrec [Sun, 9 Feb 2020 18:01:03 +0000 (19:01 +0100)]
soc: fix unit-tests

4 years agosoc: integrate constants/build
Florent Kermarrec [Sat, 8 Feb 2020 20:57:02 +0000 (21:57 +0100)]
soc: integrate constants/build

4 years agosoc: show sorted regions (by origin) / locs
Florent Kermarrec [Sat, 8 Feb 2020 20:34:26 +0000 (21:34 +0100)]
soc: show sorted regions (by origin) / locs

4 years agosoc: simplify color theme
Florent Kermarrec [Sat, 8 Feb 2020 20:30:34 +0000 (21:30 +0100)]
soc: simplify color theme

4 years agoMerge pull request #278 from scanakci/blackparrot_litex
enjoy-digital [Sat, 8 Feb 2020 09:30:55 +0000 (10:30 +0100)]
Merge pull request #278 from scanakci/blackparrot_litex

Blackparrot litex

4 years agosoc: add add_uart method
Florent Kermarrec [Sat, 8 Feb 2020 09:19:18 +0000 (10:19 +0100)]
soc: add add_uart method

4 years agosoc_core: cleanup imports
Florent Kermarrec [Fri, 7 Feb 2020 22:16:29 +0000 (23:16 +0100)]
soc_core: cleanup imports

4 years agosoc_core: get_csr_address no longer used
Florent Kermarrec [Fri, 7 Feb 2020 22:11:08 +0000 (23:11 +0100)]
soc_core: get_csr_address no longer used

4 years agosoc: integrate CSR master/interconnect/collection and IRQ collection
Florent Kermarrec [Fri, 7 Feb 2020 18:50:35 +0000 (19:50 +0100)]
soc: integrate CSR master/interconnect/collection and IRQ collection

4 years agosoc: add add_constant/add_config methods
Florent Kermarrec [Fri, 7 Feb 2020 18:09:54 +0000 (19:09 +0100)]
soc: add add_constant/add_config methods

4 years agosoc: add add_csr_bridge method
Florent Kermarrec [Fri, 7 Feb 2020 17:49:20 +0000 (18:49 +0100)]
soc: add add_csr_bridge method

4 years agosoc: add add_controller/add_identifier/add_timer methods
Florent Kermarrec [Fri, 7 Feb 2020 15:21:40 +0000 (16:21 +0100)]
soc: add add_controller/add_identifier/add_timer methods

4 years agosoc: add add_ram/add_rom methods
Florent Kermarrec [Fri, 7 Feb 2020 14:57:46 +0000 (15:57 +0100)]
soc: add add_ram/add_rom methods

4 years agosoc: add automatic bus data width convertion to add_master/add_slave
Florent Kermarrec [Fri, 7 Feb 2020 14:29:54 +0000 (15:29 +0100)]
soc: add automatic bus data width convertion to add_master/add_slave

4 years agosoc/soc_core: cleanup, remove some unused attributes
Florent Kermarrec [Fri, 7 Feb 2020 14:19:02 +0000 (15:19 +0100)]
soc/soc_core: cleanup, remove some unused attributes

4 years agosoc: move SoCController from soc_core to soc
Florent Kermarrec [Fri, 7 Feb 2020 13:52:53 +0000 (14:52 +0100)]
soc: move SoCController from soc_core to soc

4 years agosoc: create SoCLocHandler and use it to simplify SoCCSRHandler and SoCIRQHandler
Florent Kermarrec [Fri, 7 Feb 2020 12:25:54 +0000 (13:25 +0100)]
soc: create SoCLocHandler and use it to simplify SoCCSRHandler and SoCIRQHandler

4 years agosoc: add use_loc_if_exists on SoCIRQ.add to use current location is already defined
Florent Kermarrec [Thu, 6 Feb 2020 18:50:44 +0000 (19:50 +0100)]
soc: add use_loc_if_exists on SoCIRQ.add to use current location is already defined

4 years agosoc: add use_loc_if_exists on SoCCSR.add to use current location is already defined
Florent Kermarrec [Thu, 6 Feb 2020 17:50:17 +0000 (18:50 +0100)]
soc: add use_loc_if_exists on SoCCSR.add to use current location is already defined

4 years agosoc/integration: initial adaptation to new SoC class
Florent Kermarrec [Thu, 6 Feb 2020 10:07:50 +0000 (11:07 +0100)]
soc/integration: initial adaptation to new SoC class

4 years agosoc/cores/spi_opi: cleanup, rename to S7SPIOPI (since 7-Series specific for now)
Florent Kermarrec [Thu, 6 Feb 2020 16:58:01 +0000 (17:58 +0100)]
soc/cores/spi_opi: cleanup, rename to S7SPIOPI (since 7-Series specific for now)

4 years agosoc/cores: rename spiopi to spi_opi
Florent Kermarrec [Thu, 6 Feb 2020 16:08:00 +0000 (17:08 +0100)]
soc/cores: rename spiopi to spi_opi

4 years agosoc/cores/i2s: cleanup pass, rename to S7I2SSlave (since 7-Series specific for now...
Florent Kermarrec [Thu, 6 Feb 2020 16:00:04 +0000 (17:00 +0100)]
soc/cores/i2s: cleanup pass, rename to S7I2SSlave (since 7-Series specific for now), rename fifodepth to fifo_depth for consistency with others cores.

4 years agoMerge pull request #378 from betrusted-io/merge_ip
enjoy-digital [Thu, 6 Feb 2020 15:29:33 +0000 (16:29 +0100)]
Merge pull request #378 from betrusted-io/merge_ip

Request to merge I2S and SPIOPI cores

4 years agoreduce indents
bunnie [Thu, 6 Feb 2020 13:55:44 +0000 (21:55 +0800)]
reduce indents

4 years agosoc/integration: add new soc class prorotype with SoCRegion/SoCBus/SoCCSR/SoCIRQ/SoC
Florent Kermarrec [Thu, 6 Feb 2020 10:06:41 +0000 (11:06 +0100)]
soc/integration: add new soc class prorotype with SoCRegion/SoCBus/SoCCSR/SoCIRQ/SoC

4 years agoupdate doc comments on events for i2s
bunnie [Thu, 6 Feb 2020 09:58:02 +0000 (17:58 +0800)]
update doc comments on events for i2s

4 years agoadd doc comment for event
bunnie [Thu, 6 Feb 2020 09:56:21 +0000 (17:56 +0800)]
add doc comment for event

4 years agofix formatting on spiopi
bunnie [Thu, 6 Feb 2020 09:54:26 +0000 (17:54 +0800)]
fix formatting on spiopi

Pycharm really butchered the code when I did a copy-and-paste...
it has questionable default formatting preferences.

4 years agocpu/vexriscv: update submodule
Florent Kermarrec [Thu, 6 Feb 2020 09:50:35 +0000 (10:50 +0100)]
cpu/vexriscv: update submodule

4 years agoRequest to merge I2S and SPIOPI cores
bunnie [Thu, 6 Feb 2020 09:25:00 +0000 (17:25 +0800)]
Request to merge I2S and SPIOPI cores

4 years agodoc: add lxsocdoc.md (README from lxsocdoc repository)
Sean Cross [Wed, 5 Feb 2020 10:05:04 +0000 (11:05 +0100)]
doc: add lxsocdoc.md (README from lxsocdoc repository)

4 years agoMerge pull request #375 from xobs/add-lxsocdoc
enjoy-digital [Wed, 5 Feb 2020 09:15:21 +0000 (10:15 +0100)]
Merge pull request #375 from xobs/add-lxsocdoc

Add lxsocdoc

4 years agobios/main: add LiteX tagline
Florent Kermarrec [Tue, 4 Feb 2020 18:14:23 +0000 (19:14 +0100)]
bios/main: add LiteX tagline

4 years agoMerge pull request #376 from antmicro/build-sim-do-not-override-C-LD-FLAGS
enjoy-digital [Tue, 4 Feb 2020 17:19:33 +0000 (18:19 +0100)]
Merge pull request #376 from antmicro/build-sim-do-not-override-C-LD-FLAGS

build/sim: allow to use environment's {C,LD}FLAGS

4 years agobuild/sim: allow to use environment's {C,LD}FLAGS
Mariusz Glebocki [Mon, 3 Feb 2020 20:48:51 +0000 (21:48 +0100)]
build/sim: allow to use environment's {C,LD}FLAGS

There are use cases where additional flags should be added to CFLAGS or
LDFLAGS, e.g. when using Conda environment.

4 years agointegration: svd: move svd generation to `export`
Sean Cross [Tue, 4 Feb 2020 15:49:08 +0000 (23:49 +0800)]
integration: svd: move svd generation to `export`

It was suggested that we should move svd generation into `export`,
alongside the rest of the generators such as csv, json, and h.  This
performs this move, while keeping a compatible `generate_svd()` function
inside `soc/doc/`.

Signed-off-by: Sean Cross <sean@xobs.io>
4 years agosoc: doc: use sphinx toctree as it was intended
Sean Cross [Tue, 4 Feb 2020 12:34:10 +0000 (20:34 +0800)]
soc: doc: use sphinx toctree as it was intended

The sphinx toctree was behaving oddly, and so previously we were
ignoring it completely.  This patch causes it to be used correctly,
which removes the need for double-including various sections.

Signed-off-by: Sean Cross <sean@xobs.io>
4 years agolitex-doc: initial merge of lxsocdoc
Sean Cross [Tue, 4 Feb 2020 12:14:41 +0000 (20:14 +0800)]
litex-doc: initial merge of lxsocdoc

lxsocdoc enables automatic documentation of litex projects, including
automatic generation of SVD files.

This merges the existing lxsocdoc distribution into the `soc/doc` directory.

Signed-off-by: Sean Cross <sean@xobs.io>
4 years agoMerge pull request #373 from antmicro/l2-reverse
enjoy-digital [Mon, 3 Feb 2020 11:55:48 +0000 (12:55 +0100)]
Merge pull request #373 from antmicro/l2-reverse

tools/litex_sim: use l2_reverse flag

4 years agotools/litex_sim: use l2_reverse flag
Piotr Binkowski [Mon, 3 Feb 2020 11:03:57 +0000 (12:03 +0100)]
tools/litex_sim: use l2_reverse flag

4 years agowishbone/Cache: add reverse parameter
Florent Kermarrec [Fri, 31 Jan 2020 18:31:33 +0000 (19:31 +0100)]
wishbone/Cache: add reverse parameter

4 years agosoc_sdram: add l2_reverse parameter
Florent Kermarrec [Fri, 31 Jan 2020 18:16:54 +0000 (19:16 +0100)]
soc_sdram: add l2_reverse parameter

4 years agoMerge pull request #370 from Disasm/fixes
enjoy-digital [Fri, 31 Jan 2020 17:27:26 +0000 (18:27 +0100)]
Merge pull request #370 from Disasm/fixes

Small fixes

4 years agoFix argument descriptions
Vadim Kaushan [Fri, 31 Jan 2020 15:54:25 +0000 (18:54 +0300)]
Fix argument descriptions

4 years agoPass --csr-json to the Builder
Vadim Kaushan [Fri, 31 Jan 2020 15:53:50 +0000 (18:53 +0300)]
Pass --csr-json to the Builder

4 years agosoc_core: add UART bridge support (simplify having to do it externally)
Florent Kermarrec [Fri, 31 Jan 2020 14:12:18 +0000 (15:12 +0100)]
soc_core: add UART bridge support (simplify having to do it externally)

4 years agobuild/altera/quartus: fix fmt_r typo
Florent Kermarrec [Thu, 30 Jan 2020 12:55:13 +0000 (13:55 +0100)]
build/altera/quartus: fix fmt_r typo

4 years agocpu/minerva: update (use new nMigen API)
Florent Kermarrec [Thu, 30 Jan 2020 12:42:02 +0000 (13:42 +0100)]
cpu/minerva: update (use new nMigen API)

4 years agointeconnect/stream: use PipeValid implementation for Buffer
Florent Kermarrec [Thu, 30 Jan 2020 08:35:40 +0000 (09:35 +0100)]
inteconnect/stream: use PipeValid implementation for Buffer

4 years agointeconnect/stream: cleanup
Florent Kermarrec [Thu, 30 Jan 2020 08:32:04 +0000 (09:32 +0100)]
inteconnect/stream: cleanup

4 years agoMerge pull request #366 from gsomlo/gls-csr-followup
enjoy-digital [Thu, 30 Jan 2020 07:18:12 +0000 (08:18 +0100)]
Merge pull request #366 from gsomlo/gls-csr-followup

software, integration/export: (re-)expose CSR subregister accessors

4 years agosoftware, integration/export: (re-)expose CSR subregister accessors
Gabriel Somlo [Wed, 29 Jan 2020 15:54:30 +0000 (10:54 -0500)]
software, integration/export: (re-)expose CSR subregister accessors

Expose a pair of `csr_[read|write]_simple()` subregister accessors, and
restore the way dedicated accessors are generated in "generated/csr.h"
to use hard-coded combinations of shifts and subregister accessor calls.

This restores downstream ability to override CSR handling at the
subregister accessor level.

Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
4 years agointerconnect/stream: add PipeValid and PipeWait to cut timing paths.
Florent Kermarrec [Wed, 29 Jan 2020 17:27:29 +0000 (18:27 +0100)]
interconnect/stream: add PipeValid and PipeWait to cut timing paths.

4 years agobuild/xilinx/vivado: improve readability of generated tcl/xdc files
Florent Kermarrec [Wed, 29 Jan 2020 15:16:00 +0000 (16:16 +0100)]
build/xilinx/vivado: improve readability of generated tcl/xdc files

4 years agointegration/soc_core: revert integrate_sram_size default value (cause issues when...
Florent Kermarrec [Wed, 29 Jan 2020 07:31:41 +0000 (08:31 +0100)]
integration/soc_core: revert integrate_sram_size default value (cause issues when using External SPRAM).

When using SoCCore, integrated SRAM can be disabled with integrated_sram_size=0 if not wanted.

4 years agoMerge pull request #363 from antmicro/litex-sim-ddr4
enjoy-digital [Tue, 28 Jan 2020 14:36:24 +0000 (15:36 +0100)]
Merge pull request #363 from antmicro/litex-sim-ddr4

tools/litex_sim: add ddr4 PhySettings

4 years agotools/litex_sim: add ddr4 PhySettings
Piotr Binkowski [Tue, 28 Jan 2020 13:28:24 +0000 (14:28 +0100)]
tools/litex_sim: add ddr4 PhySettings

4 years agotools/litex_sim: add --sdram-init parameter
Florent Kermarrec [Mon, 27 Jan 2020 20:30:13 +0000 (21:30 +0100)]
tools/litex_sim: add --sdram-init parameter

4 years agosoftware/bios: revert M-Labs MiSoC copyright.
Florent Kermarrec [Mon, 27 Jan 2020 12:12:37 +0000 (13:12 +0100)]
software/bios: revert M-Labs MiSoC copyright.

4 years agoREADME: update copyright year and make sure LICENSE/README both mention MiSoC
Florent Kermarrec [Mon, 27 Jan 2020 11:12:53 +0000 (12:12 +0100)]
README: update copyright year and make sure LICENSE/README both mention MiSoC

4 years agoplatforms/netv2: add pcie pins
Florent Kermarrec [Sun, 26 Jan 2020 13:29:32 +0000 (14:29 +0100)]
platforms/netv2: add pcie pins

4 years agoMerge pull request #359 from gregdavill/bios_ddr3_ecp5
enjoy-digital [Sun, 26 Jan 2020 10:44:14 +0000 (11:44 +0100)]
Merge pull request #359 from gregdavill/bios_ddr3_ecp5

soc/software/bios/sdram: On ECP5 strobe dly_sel after read leveling

4 years agosoc/software/bios/sdram: ECP5 move strobe dly_sel
Greg Davill [Sat, 25 Jan 2020 23:25:38 +0000 (09:55 +1030)]
soc/software/bios/sdram: ECP5 move strobe dly_sel

4 years agosoc/software/bios/sdram: On ECP5 strobe dly_sel after read leveling
Greg Davill [Sat, 25 Jan 2020 02:41:39 +0000 (13:11 +1030)]
soc/software/bios/sdram: On ECP5 strobe dly_sel after read leveling

4 years agotools/litex_sim: update copyrights and cosmetic changes
Florent Kermarrec [Fri, 24 Jan 2020 12:58:49 +0000 (13:58 +0100)]
tools/litex_sim: update copyrights and cosmetic changes

4 years agoMerge pull request #358 from antmicro/litex_sim_ddr
enjoy-digital [Fri, 24 Jan 2020 12:33:03 +0000 (13:33 +0100)]
Merge pull request #358 from antmicro/litex_sim_ddr

tools/litex_sim: add support for other sdram types

4 years agotools/litex_sim: add support for other sdram types (DDR, LPDDR, DDR2, DDR3)
Piotr Binkowski [Fri, 24 Jan 2020 10:39:14 +0000 (11:39 +0100)]
tools/litex_sim: add support for other sdram types (DDR, LPDDR, DDR2, DDR3)

Right now litex_sim supports only SDR memories because it uses hardcoded
PhySettings. With this change PhySettings will be generated based on
selected sdram type which will allow us to use all the different types
of sdram chips in simulation.

4 years agocores/clock/create_clkout: rename clk_ce to ce, improve error reporting
Florent Kermarrec [Fri, 24 Jan 2020 08:06:35 +0000 (09:06 +0100)]
cores/clock/create_clkout: rename clk_ce to ce, improve error reporting

4 years agoMerge pull request #357 from betrusted-io/add_clk_ce
enjoy-digital [Fri, 24 Jan 2020 08:01:57 +0000 (09:01 +0100)]
Merge pull request #357 from betrusted-io/add_clk_ce

Add clk ce

4 years agoadd BUFIO to clockgen buffer options
bunnie [Fri, 24 Jan 2020 07:01:13 +0000 (15:01 +0800)]
add BUFIO to clockgen buffer options

4 years agoadd option for BUFGCE to the clock generator buffer types
bunnie [Fri, 24 Jan 2020 06:58:51 +0000 (14:58 +0800)]
add option for BUFGCE to the clock generator buffer types

4 years agotools/litex_sim: review/cleanup sdram-module/sdram-data-width features.
Florent Kermarrec [Thu, 23 Jan 2020 14:42:31 +0000 (15:42 +0100)]
tools/litex_sim: review/cleanup sdram-module/sdram-data-width features.

4 years agoMerge pull request #354 from antmicro/litex_sim_ddr
enjoy-digital [Thu, 23 Jan 2020 14:34:53 +0000 (15:34 +0100)]
Merge pull request #354 from antmicro/litex_sim_ddr

tools/litex_sim: specify dram chip and data width via commandline

4 years agotools/litex_sim: specify dram chip and data width via commandline
Piotr Binkowski [Thu, 23 Jan 2020 13:24:21 +0000 (14:24 +0100)]
tools/litex_sim: specify dram chip and data width via commandline

litex_sim used a single predefined DRAM chip, with this it is now
possible to specify which one to use with --sdram-module and also
its data bus width can be set using --sdram-data-width

4 years agoMerge pull request #351 from antmicro/fix_sram_size_argument
enjoy-digital [Thu, 23 Jan 2020 13:16:02 +0000 (14:16 +0100)]
Merge pull request #351 from antmicro/fix_sram_size_argument

Fix sram size argument

4 years agosoc_core: rename integrated_sram_size argument
Mateusz Holenko [Thu, 23 Jan 2020 12:37:02 +0000 (13:37 +0100)]
soc_core: rename integrated_sram_size argument

To keep a consistent naming scheme across all arguments.

4 years agosoc_core: fix integrated_sram_size argument type
Mateusz Holenko [Tue, 21 Jan 2020 15:36:45 +0000 (16:36 +0100)]
soc_core: fix integrated_sram_size argument type

Right now it's kept as a string and crashes
when trying to do math operations on it.

4 years agobuild/xilinx/vivado: add pre_placement/pre_routing commands
Florent Kermarrec [Tue, 21 Jan 2020 18:00:58 +0000 (19:00 +0100)]
build/xilinx/vivado: add pre_placement/pre_routing commands

4 years agocores/icap: add add_timing_constraints method
Florent Kermarrec [Tue, 21 Jan 2020 13:08:36 +0000 (14:08 +0100)]
cores/icap: add add_timing_constraints method