Commit Graph

7380 Commits

Author SHA1 Message Date
Florent Kermarrec 109fd2674a integration/builder: simplify default output_dir to "build/platform".
All SoC are now based on the same base class and naming was too complicated.
2020-05-19 13:59:56 +02:00
Florent Kermarrec 55c0ddab36 litex_setup: add sha1 support on git clone/pull and fix microwatt to a specific sha1.
The pythondata are generated automatically from external sources, some of them are
stable, some others still under development, so allow specifying a specific sha1
commit for sources that are moving and breaking LiteX support.
2020-05-19 13:27:12 +02:00
enjoy-digital 23d43a2c23
Merge pull request #530 from enjoy-digital/bios-libs
BIOS: move cores' specific code to libs and cleanup.
2020-05-19 08:18:44 +02:00
Florent Kermarrec 7192397ab4 software/libbase: remove linker-sdram (unused). 2020-05-18 23:35:48 +02:00
Florent Kermarrec b4b84def3c software/bios: mode spisdcard code to liblitesdcard. 2020-05-18 23:33:34 +02:00
Florent Kermarrec 21e2a34c3f software/bios: rename commands to cmds and update with libs' names. 2020-05-18 23:26:51 +02:00
Florent Kermarrec 33f6ce7431 software/bios: move hw flags definitions to respective libs, remove hw/flags.h. 2020-05-18 23:09:31 +02:00
Florent Kermarrec 403355a8ed software: create liblitescard and move sdcard init/test code to it. 2020-05-18 22:49:12 +02:00
Florent Kermarrec 920d0ee536 software: create liblitedram and move sdram init/test code to it. 2020-05-18 22:42:23 +02:00
Florent Kermarrec c95084e5c6 bios/software: rename cmd_dram/cmd_sdcard/cmd_spi_flash to cmd_litedram/cmd_litesdcard/cmd_spiflash. 2020-05-18 22:24:24 +02:00
Florent Kermarrec 573a881529 software/bios/commands: rename cmd_mdio to cmd_liteeth. 2020-05-18 22:16:20 +02:00
Florent Kermarrec ff8d9e61bf software/bios: move mdio to libliteeth. 2020-05-18 21:09:41 +02:00
Florent Kermarrec 70a67ce7ed software/bios: rename libnet to libliteeth and move all ethernet files to it. 2020-05-18 21:04:54 +02:00
Florent Kermarrec 56b8723b72 software/bios: rename cmd_mem_access to cmd_mem. 2020-05-18 19:59:28 +02:00
Florent Kermarrec a02077d547 cpu/microwatt/add_sources: add use_ghdl_yosys_synth parameter to convert microwatt to verilog using GHDL-Yosys-plugin and use converted verilog for build. 2020-05-18 17:30:42 +02:00
Florent Kermarrec b5352f403c cpu/microwatt: update microwatt_wraper.vhdl 2020-05-18 16:38:08 +02:00
Florent Kermarrec be25500e91 uptime: rework and integrate it in Timer to ease software support. 2020-05-17 11:05:14 +02:00
Florent Kermarrec d6549ff8f1 bios: add uptime command and rewrite cmd_bios comments. 2020-05-16 10:02:31 +02:00
Florent Kermarrec fc0e55be32 soc: improve uptime comments. 2020-05-16 10:01:39 +02:00
enjoy-digital 840679add6
Merge pull request #526 from rprinz08/master
Make booting from SD-Card to behave same as from SPI flash
2020-05-15 16:03:37 +02:00
Florent Kermarrec 82364de57f soc/SoCController: add uptime since start (disabled by default) and allow features to be enabled/disabled. 2020-05-15 15:00:04 +02:00
rprinz08 3f649077b1 Make booting from SD-Card to behave same as from SPI flash 2020-05-15 12:07:52 +02:00
Florent Kermarrec 3391398a5f bios/sdram: always show bitslip on two digits to keep scan aligned. 2020-05-14 15:20:52 +02:00
enjoy-digital 4a5072a014
Merge pull request #517 from ozbenh/csr-access-rework
csr: Rework accessors
2020-05-14 15:04:52 +02:00
Benjamin Herrenschmidt 1e35b0e705 csr: Rework accessors
Have all the new compound accessors be written in terms of the simple
ones and fix how CSR_ACCCESORS_DEFINED can be used to override the
simple ones but keep the definitions of the other ones around.

This *should* also also fix incorrect multiple accesses done
by  64-bit CPUs to 32-bit CSR busses, and make the accessors not
depend on CONFIG_CSR_ALIGNMENT being the same as sizeof(unsigned long)*8

In addition, the generated csr.h now will include system.h
always when with_access_functions is True. This guarantees that the
higher level accessors are defined. The extern prototypes for the
simple accessors when CSR_ACCCESORS_DEFINED are removed and system.h
is responsible for providing them. It is also added to hw/common.h

This allows system.h to set CSR_ACCCESORS_DEFINED when necessary, in
which case it's responsible for both declaring and defining the simple
accessors. That way, it can make them inline rather than forcing them
to be extern which at least on microwatt saves spaces.

One can continue to use -DCSR_ACCCESORS_DEFINED but in that case a system.h
will have to be provided with at least the extern definitions.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2020-05-14 21:38:19 +10:00
Florent Kermarrec d4f44597de CHANGES: update. 2020-05-14 09:34:37 +02:00
enjoy-digital a51c7a7bac
Merge pull request #518 from enjoy-digital/csr_base
export: add define of CSR_BASE if not already defined and use it for …
2020-05-14 08:02:37 +02:00
enjoy-digital 177c1e5397
Merge pull request #523 from DurandA/patch-5
Update litex_term help
2020-05-14 07:17:46 +02:00
Arnaud Durand 9d9e7d54cd
Update litex_term help
Specify the use of kernel address with flash flag.
2020-05-13 22:50:09 +02:00
Florent Kermarrec 2e59dc329d platforms/nexys4ddr: add card detect pin to sdcard. 2020-05-13 19:11:46 +02:00
Florent Kermarrec 51742be2bb integration/soc: review/simplify interconnect and add logger.info. 2020-05-13 18:29:12 +02:00
enjoy-digital 78413cc09e
Merge pull request #519 from ozbenh/point2point
soc: Revive generation of a PointToPoint interconnect
2020-05-13 16:48:21 +02:00
Benjamin Herrenschmidt 1ed6869110 soc: Revive generation of a PointToPoint interconnect
When there's only one master, one slave, and that slave is at 0

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2020-05-14 00:06:53 +10:00
Florent Kermarrec 748ef1add3 export: add define of CSR_BASE if not already defined and use it for CSRs definitions/accesses.
This will allow more flexibility when integrating standalone cores.
2020-05-13 15:56:20 +02:00
Florent Kermarrec 9f941138d2 test/test_targets: workaround to fix travis. 2020-05-13 11:04:40 +02:00
Florent Kermarrec 9d1443c1a8 cpu/soc_core: automatically set csr mapping to 0x00000000 when using CPUNone, remove csr_base parameter that was used for that. 2020-05-13 09:31:20 +02:00
Florent Kermarrec 5ea3bae036 bios/boot: review/fix #503.
- copy_image_from_flash_to_ram is now used by all CPUs.
- copy_image_from_flash_to_ram already show the flash address, no need to duplicate it.
2020-05-13 08:44:17 +02:00
enjoy-digital bf7857f553
Merge pull request #503 from rprinz08/master
BIOS boot firmware from SPI with address offset
2020-05-13 08:36:43 +02:00
enjoy-digital b4e349eb49
Merge pull request #513 from mubes/bios_linker
Bios linker edits to prevent inappropriate optimisation
2020-05-13 07:52:37 +02:00
Dave Marples d2d82dacf2 Bios linker edits to prevent inappropriate optimisation 2020-05-12 23:32:49 +01:00
rprinz08 1f55fcf449 fixed bug in BIOS spi flash "fw" command 2020-05-12 16:58:42 +02:00
rprinz08 f062c0c44b removed FLASH_BOOT_OFFSET, replaced memcyp with copy_image_from_flash_to_ram 2020-05-12 16:57:21 +02:00
Florent Kermarrec 3fb99b7d33 cores/spi_flash: add back old SpiFlashDualQuad and rename new one as SpiFlashQuadReadWrite. 2020-05-12 16:51:47 +02:00
enjoy-digital 2a5a7536b8
Merge pull request #478 from antmicro/extended_spi_flash
Extended SPI flash support
2020-05-12 16:42:01 +02:00
enjoy-digital 7d79da8eda
Merge pull request #510 from mubes/colorlight_usb
Colorlight usb
2020-05-12 16:35:29 +02:00
Florent Kermarrec 3a6dd95d6f integration/soc: review/simplify changes for standalone cores.
- do the CSR alignment update only if CPU is not CPUNone.
- revert PointToPoint interconnect when 1 master and 1 slave since this will
break others use cases and will prevent mapping slave to a specific location.
It's probably better to let the synthesis tools optimize the 1:1 mapping directly.
- add with_soc_interconnect parameter to add_sdram that defaults to True. When
set to False, only the LiteDRAMCore will be instantiated and interconnect with
the SoC will not be added.
2020-05-12 16:18:26 +02:00
Dave Marples 8499733289 Fix dumb missing line 2020-05-12 14:40:11 +01:00
enjoy-digital 0d5eb13359
Merge pull request #511 from ozbenh/standalone-cores
Improve standalone cores
2020-05-12 14:55:44 +02:00
Florent Kermarrec 873d95e517 interconnect/wishbonebridge: refresh/simplify.
This should also improve Wishbone timings.

Tested on iCEBreaker:
./icebreaker.py --cpu-type=None --uart-name=uartbone --csr-csv=csr.csv --build --flash

With the following script:

#!/usr/bin/env python3

import sys

from litex import RemoteClient

wb = RemoteClient()
wb.open()

# # #

print("scratch: 0x{:08x}".format(wb.regs.ctrl_scratch.read()))

errors = 0
for i in range(2):
for j in range(32):
wb.write(wb.mems.sram.base + 4*j, i + j)
for j in range(32):
if wb.read(wb.mems.sram.base + 4*j) != (i + j):
errors += 1
print("sram errors: {:d}".format(errors))

# # #

wb.close()
2020-05-12 13:40:28 +02:00
Benjamin Herrenschmidt f628ff6b47 WB2CSR: Use CSR address_width for the wishbone bus
Currently, we create a wishbone interface with the default address
width (30 bits) for the bridge. Instead, create an interface that
has the same number of address bits as the CSR bus.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2020-05-12 21:37:36 +10:00