litex.git
4 years agosoc_core: add back identifier
Florent Kermarrec [Sat, 15 Feb 2020 18:04:47 +0000 (19:04 +0100)]
soc_core: add back identifier

4 years agoMerge pull request #387 from BracketMaster/master
enjoy-digital [Sat, 15 Feb 2020 16:05:50 +0000 (17:05 +0100)]
Merge pull request #387 from BracketMaster/master

litex_sim now working on MacOS and Linux

4 years agoupdate to work with mac
Yehowshua Immanuel [Fri, 14 Feb 2020 22:53:25 +0000 (17:53 -0500)]
update to work with mac

4 years agotools/litex_sim: specify default local/remote-ip addresses.
Florent Kermarrec [Sat, 15 Feb 2020 13:04:44 +0000 (14:04 +0100)]
tools/litex_sim: specify default local/remote-ip addresses.

4 years agotools/litex_sim: add ethernet local/remote-ip arguments.
Florent Kermarrec [Sat, 15 Feb 2020 13:01:46 +0000 (14:01 +0100)]
tools/litex_sim: add ethernet local/remote-ip arguments.

4 years agointerconnect/stream: cleanup imports/idents
Florent Kermarrec [Fri, 14 Feb 2020 07:08:19 +0000 (08:08 +0100)]
interconnect/stream: cleanup imports/idents

4 years agoMerge pull request #386 from antmicro/sdram-timing-checker
enjoy-digital [Thu, 13 Feb 2020 15:53:12 +0000 (16:53 +0100)]
Merge pull request #386 from antmicro/sdram-timing-checker

tools/litex_sim: add cli options to control SDRAM timing checker

4 years agotools/litex_sim: add cli options to control SDRAM timing checker
Piotr Binkowski [Thu, 13 Feb 2020 13:45:15 +0000 (14:45 +0100)]
tools/litex_sim: add cli options to control SDRAM timing checker

4 years agosoc_core: fix cpu_variant renaming regression
Florent Kermarrec [Thu, 13 Feb 2020 07:34:16 +0000 (08:34 +0100)]
soc_core: fix cpu_variant renaming regression

4 years agodoc: rename lxsocdoc -> socdoc and update readme
Sean Cross [Thu, 13 Feb 2020 00:47:58 +0000 (08:47 +0800)]
doc: rename lxsocdoc -> socdoc and update readme

With the merge of lxsocdoc into upstream litex, the old name of
"lxsocdoc" doesn't make as much sense.  Additionally, the import paths
are now different.

Rename this file to reflect the new home of `soc/doc`, and update the
code examples to work with the new name.

Signed-off-by: Sean Cross <sean@xobs.io>
4 years agodoc: fix regression with new irq manager
Sean Cross [Thu, 13 Feb 2020 00:32:44 +0000 (08:32 +0800)]
doc: fix regression with new irq manager

Previously, we were accessing the `soc.soc_interrupt_map` property in
order to be able to enumerate the interrupts.  This has been subsumed
into a more general `irq` object that manages the interrupts.

Use `soc.irq.locs` instead of `soc.soc_interrupt_map` as the authority
on interrupts for both doc and export.

This fixes #385.

Signed-off-by: Sean Cross <sean@xobs.io>
4 years agosoc/CSR: show alignment in report and add info when updating.
Florent Kermarrec [Wed, 12 Feb 2020 20:55:30 +0000 (21:55 +0100)]
soc/CSR: show alignment in report and add info when updating.

4 years agosoc/add_cpu: use cpu.data_width as CSR alignment, fix regression on Rocket
Florent Kermarrec [Wed, 12 Feb 2020 20:25:20 +0000 (21:25 +0100)]
soc/add_cpu: use cpu.data_width as CSR alignment, fix regression on Rocket

4 years agointegration/soc: fix refactoring issues
Florent Kermarrec [Wed, 12 Feb 2020 17:16:38 +0000 (18:16 +0100)]
integration/soc: fix refactoring issues

4 years agosoc/integration/builder: update copyright, align arguments
Florent Kermarrec [Wed, 12 Feb 2020 15:43:11 +0000 (16:43 +0100)]
soc/integration/builder: update copyright, align arguments

4 years agoMerge pull request #383 from Xiretza/builder-directories
enjoy-digital [Wed, 12 Feb 2020 15:38:04 +0000 (16:38 +0100)]
Merge pull request #383 from Xiretza/builder-directories

Unify output directory handling in builder

4 years agoUnify output directory handling in builder
Xiretza [Wed, 12 Feb 2020 13:35:23 +0000 (14:35 +0100)]
Unify output directory handling in builder

4 years agoMerge pull request #382 from enjoy-digital/new_soc
enjoy-digital [Tue, 11 Feb 2020 17:39:33 +0000 (18:39 +0100)]
Merge pull request #382 from enjoy-digital/new_soc

Add new SoC/LiteXSoC classes and use it for SoCCore/SoCSDRAM

4 years agosoc_core/soc_sdram: add disclaimer
Florent Kermarrec [Tue, 11 Feb 2020 17:28:05 +0000 (18:28 +0100)]
soc_core/soc_sdram: add disclaimer

4 years agosoc_core: provide full retro-compatibily when add_wb_slave is called before add_memor...
Florent Kermarrec [Tue, 11 Feb 2020 17:21:41 +0000 (18:21 +0100)]
soc_core: provide full retro-compatibily when add_wb_slave is called before add_memory_region

4 years agosoc: fix busword typo
Florent Kermarrec [Tue, 11 Feb 2020 16:50:26 +0000 (17:50 +0100)]
soc: fix busword typo

4 years agotargets/EthernetSoC: be sure memory region is added before adding Wishbone Slave...
Florent Kermarrec [Tue, 11 Feb 2020 16:44:24 +0000 (17:44 +0100)]
targets/EthernetSoC: be sure memory region is added before adding Wishbone Slave (required by new SoC)

4 years agoMerge branch 'master' into new_soc
enjoy-digital [Tue, 11 Feb 2020 16:22:06 +0000 (17:22 +0100)]
Merge branch 'master' into new_soc

4 years agosoc/integration: move mem_decoder to soc_core
Florent Kermarrec [Tue, 11 Feb 2020 16:19:22 +0000 (17:19 +0100)]
soc/integration: move mem_decoder to soc_core

4 years agosoc/integration/common: simplify get_version
Florent Kermarrec [Tue, 11 Feb 2020 16:16:24 +0000 (17:16 +0100)]
soc/integration/common: simplify get_version

4 years agosoc/add_uart: fix bridge
Florent Kermarrec [Tue, 11 Feb 2020 15:55:37 +0000 (16:55 +0100)]
soc/add_uart: fix bridge

4 years agosoc_core/soc_sdram: remove disclaimer (we'll add it later when designs will be adapted)
Florent Kermarrec [Tue, 11 Feb 2020 15:44:17 +0000 (16:44 +0100)]
soc_core/soc_sdram: remove disclaimer (we'll add it later when designs will be adapted)

4 years agosoc: avoid double definition of main_ram
Florent Kermarrec [Tue, 11 Feb 2020 15:39:37 +0000 (16:39 +0100)]
soc: avoid double definition of main_ram

4 years agosoc: improve log colors on error reporting
Florent Kermarrec [Tue, 11 Feb 2020 15:24:57 +0000 (16:24 +0100)]
soc: improve log colors on error reporting

4 years agosoc: add linker regions management
Florent Kermarrec [Tue, 11 Feb 2020 14:28:02 +0000 (15:28 +0100)]
soc: add linker regions management

4 years agosoc: improve log presentation/colors
Florent Kermarrec [Tue, 11 Feb 2020 13:50:16 +0000 (14:50 +0100)]
soc: improve log presentation/colors

4 years agosoc: fix cpu_reset_address
Florent Kermarrec [Tue, 11 Feb 2020 13:17:32 +0000 (14:17 +0100)]
soc: fix cpu_reset_address

4 years agotools/litex_sim_new: remove
Florent Kermarrec [Tue, 11 Feb 2020 13:05:01 +0000 (14:05 +0100)]
tools/litex_sim_new: remove

4 years agosoc: fix build_time format
Florent Kermarrec [Tue, 11 Feb 2020 12:23:46 +0000 (13:23 +0100)]
soc: fix build_time format

4 years agocores/cpu: remove separators on io_regions (requires python 3.6)
Florent Kermarrec [Tue, 11 Feb 2020 12:12:54 +0000 (13:12 +0100)]
cores/cpu: remove separators on io_regions (requires python 3.6)

4 years agoMerge pull request #380 from Xiretza/cpunone-all-io
enjoy-digital [Tue, 11 Feb 2020 12:11:33 +0000 (13:11 +0100)]
Merge pull request #380 from Xiretza/cpunone-all-io

Allow all memory regions to be used as IO with CPUNone

4 years agosoc/add_sdram: simplify L2 Cache, use FullMemoryWE on L2 Cache by default (seems...
Florent Kermarrec [Tue, 11 Feb 2020 08:30:36 +0000 (09:30 +0100)]
soc/add_sdram: simplify L2 Cache, use FullMemoryWE on L2 Cache by default (seems better on all devices)

4 years agosoc_core/common: move old mem_decoder to soc_core, simplify get_version
Florent Kermarrec [Tue, 11 Feb 2020 07:44:23 +0000 (08:44 +0100)]
soc_core/common: move old mem_decoder to soc_core, simplify get_version

4 years agoAllow all memory regions to be used as IO with CPUNone
Xiretza [Mon, 10 Feb 2020 18:56:36 +0000 (19:56 +0100)]
Allow all memory regions to be used as IO with CPUNone

4 years agointegration/common: fix mem_decoder (shadow base has been deprecated)
Florent Kermarrec [Mon, 10 Feb 2020 18:40:56 +0000 (19:40 +0100)]
integration/common: fix mem_decoder (shadow base has been deprecated)

4 years agotools/litex_sim_new: switch to dynamically allocated ethmac origin
Florent Kermarrec [Mon, 10 Feb 2020 18:37:53 +0000 (19:37 +0100)]
tools/litex_sim_new: switch to dynamically allocated ethmac origin

4 years agosoc/SoCRegion/Decoder: pass bus to decoder and remove mask on origin
Florent Kermarrec [Mon, 10 Feb 2020 18:34:18 +0000 (19:34 +0100)]
soc/SoCRegion/Decoder: pass bus to decoder and remove mask on origin

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>