Commit Graph

6682 Commits

Author SHA1 Message Date
Florent Kermarrec 2287f73937 tools/litex_client: add --read/--write args to do simple MMAP accesses to SoC bus.
ex reading/writing to scratch register over jtagbone:

In the SoC:
self.add_jtagbone()

Open LiteX Server:
litex_server --jtag

Do the MMAP accesses:
./litex_cli --read 0x4
0x12345678
./litex_clk --write 0x4 0x5aa55aa5
./litex_cli --read 0x4
0x5aa55aa5
2021-01-28 17:46:18 +01:00
Jędrzej Boczar 38b819c42a software/liblitedram: selectable write leveling MR (for LPDDR4 support) 2021-01-28 15:56:13 +01:00
Jędrzej Boczar e3172faad9 software/liblitedram: support PHYs with more than 4 DFI phases 2021-01-28 15:53:40 +01:00
Florent Kermarrec 7abfbd9825 tools/litex_json2dts/ethernet: add missing 'status = "okay";'.
Was causing https://github.com/litex-hub/linux-on-litex-vexriscv/issues/178.
2021-01-27 11:52:04 +01:00
Florent Kermarrec b8bcbc522f integration/export/triple: use LITEX_ENV_CC_TRIPLE instead of TRIPLE.
triple can be used internally, but is too generic as an environment variable.
2021-01-27 08:25:48 +01:00
enjoy-digital f331ddace8
Merge pull request #780 from garytwong/triple-option
integration/export: allow manually specifying toolchain triple.
2021-01-27 08:16:41 +01:00
Florent Kermarrec 61034fe0f9 litex_setup/update: do a git submodule update --init --recursive on repos with recursive set to True.
Simplify for example pythondata-cpu-vexriscv-smp updates.
2021-01-27 07:55:59 +01:00
Florent Kermarrec 2f89e0aecf soc/do_finalize: check that crg.rst is a Signal before connecting to ctrl._reset. 2021-01-26 17:08:43 +01:00
Florent Kermarrec cafe0944f1 soc/add_uartbone/add_jtagbone: improve phy naming and add uartbone_phy to CSR. 2021-01-26 15:46:55 +01:00
enjoy-digital 7479cbe71b
Merge pull request #784 from Acathla-fr/patch-1
Update comm_usb.py
2021-01-26 14:36:07 +01:00
Florent Kermarrec 331124dd23 tools/litex_server: add --jtag-config args to provide OpenOCD configuration file. 2021-01-26 14:32:36 +01:00
Florent Kermarrec 2e1b9ed948 tools/litex_server: rename --jtag-uart to --jtag. 2021-01-26 14:12:54 +01:00
Florent Kermarrec 531ce0e8b7 soc: create specific add_jtagbone method instead of integrating it in add_uartbnone.
Creates a JTAG bridge in the SoC simply with self.add_jtagbone(), almost comes for free :)
2021-01-26 14:12:19 +01:00
Acathla-fr a092d5b28f
Update comm_usb.py
typo : csr_csr replaced by csr_csv
2021-01-26 12:34:08 +01:00
Florent Kermarrec ed1da7ed1e soc/add_pcie: expose max_pending_requests parameter.
Being able to configure it is useful to find resource usage/performance compromise.
2021-01-26 10:59:22 +01:00
Florent Kermarrec dd985cd1d0 integration/export: disable CSRField extract/read functions generation for csr.size > 32-bit. 2021-01-26 10:23:56 +01:00
Florent Kermarrec 2a542e150d jtag_uart/openocd: switch to raw tcp socket and get litex_server --jtag-uart working. 2021-01-25 16:33:43 +01:00
Florent Kermarrec 7799765471 soc/jtag: run JTAGPHY in sys_jtag clock domain (to fix behavior after reset). 2021-01-25 16:31:55 +01:00
Florent Kermarrec 213644af70 integration/soc/add_uart: ResetInserter no longer required on UART since reboot is now doing a full system reset. 2021-01-25 13:39:45 +01:00
Florent Kermarrec 8cada67f32 cores/jtag: cleanup instances. 2021-01-25 12:31:32 +01:00
Florent Kermarrec 0b5df58a1b cores/jtag: cores/uart: expose jtag/tx/rx_cdc (to ease probing with LiteScope). 2021-01-25 12:30:43 +01:00
Florent Kermarrec 4df336341b cores/uart: expose fsm/timer (to ease probing with LiteScope). 2021-01-25 12:29:18 +01:00
Florent Kermarrec 17195c5e96 cpu/vexriscv_smp: cleanup new args integration and fix cluster naming. 2021-01-25 11:48:05 +01:00
enjoy-digital 7fa03cb1f3
Merge pull request #782 from enjoy-digital/vexriscv-smp-no-litedram
soc/cpu/vexriscv-smp: add args to disable out of order or direct path to LiteDRAM
2021-01-25 08:45:03 +01:00
Florent Kermarrec 1a38d51e08 libbase/memtest: remove 0x no longer required with %p. 2021-01-24 21:09:19 +01:00
Dolu1990 ae2cd31573 soc/cpu/vexriscv-smp add --without-out-of-order-decode and --with-wishbone-memory 2021-01-23 20:38:50 +01:00
Florent Kermarrec 01a2fc11e2 integration/soc/usb_acm: run USB ACM in sys_usb clock domain similar to sys clock domain but with rst disconnected. 2021-01-22 22:57:24 +01:00
Gary Wong 13d1d4cf8e integration/export: allow manually specifying toolchain triple.
If the environment variable TRIPLE is defined, use its value as the
highest priority candidate.  Useful for testing new cross-compilers,
or selecting among toolchains in a different priority than the built-in
list.
2021-01-22 12:11:03 -07:00
Florent Kermarrec 8623b0a16a integration/soc/add_uartbone: fix jtag_uart integration. 2021-01-22 15:00:13 +01:00
Florent Kermarrec d7aedfbc12 tools/litex_server: add initial JTAG-UART support. 2021-01-22 14:19:38 +01:00
Florent Kermarrec 697ff7447c soc/integration: add initial JTAG-UART support to UARTbone. 2021-01-22 14:19:03 +01:00
Florent Kermarrec e8cfe3b6ea software/liblitedram: fix typo. 2021-01-22 11:57:06 +01:00
enjoy-digital f22079dc94
Merge pull request #776 from geertu/compiler-warning-fixes
Compiler warning fixes
2021-01-22 09:28:23 +01:00
enjoy-digital e366cf2928
Merge pull request #778 from blakesmith/timer_tests
Add initial core test for Timer
2021-01-22 09:16:59 +01:00
Blake Smith 98b75d8671 Add initial core test for Timer 2021-01-21 21:37:41 -06:00
Florent Kermarrec 4e5f20a060 software/liblitedram: rename Half Sys8x Taps to tCK/4 and display "-" during write calibration when no valid bitstlip found. 2021-01-21 20:00:29 +01:00
Florent Kermarrec 57289dd47c software/liblitedram/write_leveling: display Half Sys8x Taps value before write_leveling. 2021-01-20 09:43:53 +01:00
Florent Kermarrec acb6741b8a software/bios: rename CONFIG_SIM_DISABLE_DELAY to CONFIG_DISABLE_DELAYS and disable timeout on serialboot's check_ack when CONFIG_DISABLE_DELAYS is set.
This is useful in simulation to skip serialboot ack check.
2021-01-20 09:42:29 +01:00
Geert Uytterhoeven 0f28bc489d software/include/base/stdio: Enable printf format strings checks
Now all format issues are fixed, tag all functions taking printf()-style
format specifiers with "__attribute__((format(printf, ...))", enabling
format string checks ("-Wall" includes "-Wformat").

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven c3dea1b9fd software: Use "%p" to format pointer values
To fix compiler warnings of the following type:

    warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'foo *' [-Wformat=]

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven 19e7b53762 software: Use "l" length modifier to format long values
To fix compiler warnings of the following type:

    warning: format '%x' expects argument of type 'unsigned int', but argument has type 'long unsigned int' [-Wformat=]

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven a2389c71ea software: Fix cast from pointer to integer of different size warnings
litex/soc/software/liblitesdcard/sdcard.c: In function 'sdcard_read':
    litex/soc/software/liblitesdcard/sdcard.c:476:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
      sdblock2mem_dma_base_write((uint64_t) buf);
				 ^
    litex/soc/software/liblitesdcard/sdcard.c: In function 'sdcard_write':
    litex/soc/software/liblitesdcard/sdcard.c:507:30: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
       sdmem2block_dma_base_write((uint64_t) buf);
				  ^

When casting a pointer (32-bit or 64-bit, depending on the platform) to
a 64-bit integer, an intermediate cast to "uintptr_t" should be used to
avoid warnings like the above.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven 5474f563c8 software/bios/readline: Use unsigned int for small numbers
There is no need to use "unsigned long" for small numbers related to the
number of characters in a line.  Use "unsigned int" instead.

This allows us to drop the casts when calling putnstr(), and fixes compiler
warnings on 64-bit for callsites where the casts were missing:

    warning: field precision specifier '.*' expects argument of type 'int', but argument 2 has type 'long unsigned int'

Reported-by: Gabriel Somlo <gsomlo@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven ab8cee1b5e software/bios/cmds/cmd_i2c: Use "%zu" to format size_t
The sizeof operator returns "size_t", which is defined to be "unsigned
int" on 32-bit, and "unsigned long" on 64-bit.

Format it using "%zu", to fix compiler warnings of the following type on
64-bit:

    warning: format '%d' expects argument of type 'int', but argument has type 'long unsigned int' [-Wformat=]

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven cbd54e7b5c software/bios/cmds/cmd_bios: Make crc command 64-bit clean
On 64-bit:

    litex/soc/software/bios/cmds/cmd_bios.c: In function 'crc_handler':
    litex/soc/software/bios/cmds/cmd_bios.c:110:30: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
      printf("CRC32: %08x", crc32((unsigned char *)addr, length));
				  ^

Fix this by using the appropriate types (uintptr_t and size_t) for
memory addresses and sizes, which are defined to 32-bit or 64-bit,
depending on the platform.

Note that the specified length must still be smaller than 4 GiB on
64-bit, or it will be truncated, as the crc32() function is currently
limited to a 32-bit size anyway.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven 857ef69b3f software/bios/boot: Fix cast to pointer from integer of different size warnings
On 64-bit:

    litex/soc/software/bios/boot.c: In function 'serialboot':
    litex/soc/software/bios/boot.c:216:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
	 writepointer = (char *) get_uint32(&frame.payload[0]);
			^

When casting from a 32-bit integer to a pointer (32-bit or 64-bit,
depending on the platform), an intermediate cast to "uintptr_t" should
be used to avoid warnings like the above.

Note that using a 32-bit integer is OK, even on 64-bit, as this is
specified by the boot protocol.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven 84e3a77724 software/liblitedram: Use "%u" to format uint32_t values
To fix compiler warnings of the following type:

    warning: format '%lu' expects argument of type 'long unsigned int', but argument has type 'unsigned int' [-Wformat=]

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven b979e69934 software/libbase: Remove empty printf statements
To fix compiler warnings of the following type:

    warning: zero-length gnu_printf format string [-Wformat-zero-length]

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven bff23b8f73 software/libbase/vsnprintf: Prefix pointers by "0x"
Set the PRINTF_SPECIAL flag when printing pointers, so they are prefixed
by "0x", to match glibc behavior.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00
Geert Uytterhoeven 91c9192626 software/include/base: Fix size_t, ptrdiff_t, and (u)intptr_t
As per convention, the types of size_t, ptrdiff_t, intptr_t, and
uintptr_t should be based on "long" or "int" depending on the platform
(32-bit or 64-bit).

This fixes compiler warnings of the following type:

    litex/soc/software/liblitesdcard/sdcard.c: In function 'sdcard_read':
    litex/soc/software/liblitesdcard/sdcard.c:476:39: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
      sdblock2mem_dma_base_write((uint64_t)(uintptr_t) buf);
					  ^

Reported-by: Gabriel Somlo <gsomlo@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2021-01-19 15:03:48 +01:00