From 6beaf1370596aec607397598cf8b654b79a263ab Mon Sep 17 00:00:00 2001 From: Cyril Koenig Date: Thu, 23 Jan 2025 21:58:37 +0100 Subject: [PATCH] misc: Update docs and licenses --- docs/tg/xilinx.md | 6 ++++-- sw/boot/carfield_bd_vcu118.dts | 2 +- target/xilinx/flavor_bd/constraints/vcu118_ext_jtag.xdc | 2 +- target/xilinx/flavor_bd/constraints/vcu128_ext_jtag.xdc | 2 +- target/xilinx/flavor_vanilla/flavor_vanilla.mk | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/tg/xilinx.md b/docs/tg/xilinx.md index f57a1119..1991f62b 100644 --- a/docs/tg/xilinx.md +++ b/docs/tg/xilinx.md @@ -11,6 +11,8 @@ We currently provide working setups for: - Xilinx VCU128 with Vivado `== 2020.2` - Xilinx VCU118 with Vivado `== 2020.2` +:warning: At the moment it is required to use the Vivado version above + **Note: Certain version of Vivado might cause issue, until these issues are resolved it is safer to use 2020.2** We are working on support for more boards in the future. @@ -27,7 +29,7 @@ design flow to link Carfield with external IPs. This flow is less human readable integrating more complex IPs as Xilinx Ethernet. *Note that this may require you to own the respective licenses.* -## For impatient readers +## Quick Start The recommended command to build a bitstream (for VCU128) is @@ -158,7 +160,7 @@ JTAG chain to connect GDB to the debug-module in the bitstream. using the Xilinx BSCANE macro. With this, you will only need the normal Xilinx USB cable to interact with CVA6. Note that it means that Vivado and OpenOCD can not use the same cable at the same time. ->**WARNING: this setup (with `EXT_JTAG=0`) will only work for designs containing the host only** as +> :warning: This setup (with `EXT_JTAG=0`) will only work for designs containing the host only** as it is not possible to chain multiple devices on the BSCANE macro. If you need to use `EXT_JTAG=0` consider modifying the RTL to remove the debug modules of the IPs. > When using `EXT_JTAG=1` we add an external JTAG chain for the RV64 host and other island through diff --git a/sw/boot/carfield_bd_vcu118.dts b/sw/boot/carfield_bd_vcu118.dts index c3d2805d..2f963a68 100644 --- a/sw/boot/carfield_bd_vcu118.dts +++ b/sw/boot/carfield_bd_vcu118.dts @@ -1,4 +1,4 @@ -// Copyright 2022 ETH Zurich and University of Bologna. +// Copyright 2025 ETH Zurich and University of Bologna. // Solderpad Hardware License, Version 0.51, see LICENSE for details. // SPDX-License-Identifier: SHL-0.51 // diff --git a/target/xilinx/flavor_bd/constraints/vcu118_ext_jtag.xdc b/target/xilinx/flavor_bd/constraints/vcu118_ext_jtag.xdc index c029c38d..3fd40e13 100644 --- a/target/xilinx/flavor_bd/constraints/vcu118_ext_jtag.xdc +++ b/target/xilinx/flavor_bd/constraints/vcu118_ext_jtag.xdc @@ -1,4 +1,4 @@ -# Copyright 2024 ETH Zurich and University of Bologna. +# Copyright 2025 ETH Zurich and University of Bologna. # Solderpad Hardware License, Version 0.51, see LICENSE for details. # SPDX-License-Identifier: SHL-0.51 # diff --git a/target/xilinx/flavor_bd/constraints/vcu128_ext_jtag.xdc b/target/xilinx/flavor_bd/constraints/vcu128_ext_jtag.xdc index 61a8a3ae..f5e444c5 100644 --- a/target/xilinx/flavor_bd/constraints/vcu128_ext_jtag.xdc +++ b/target/xilinx/flavor_bd/constraints/vcu128_ext_jtag.xdc @@ -1,4 +1,4 @@ -# Copyright 2024 ETH Zurich and University of Bologna. +# Copyright 2025 ETH Zurich and University of Bologna. # Solderpad Hardware License, Version 0.51, see LICENSE for details. # SPDX-License-Identifier: SHL-0.51 # diff --git a/target/xilinx/flavor_vanilla/flavor_vanilla.mk b/target/xilinx/flavor_vanilla/flavor_vanilla.mk index 5251713d..86fc5abd 100644 --- a/target/xilinx/flavor_vanilla/flavor_vanilla.mk +++ b/target/xilinx/flavor_vanilla/flavor_vanilla.mk @@ -46,7 +46,7 @@ $(CAR_XIL_DIR)/flavor_vanilla/scripts/add_sources.tcl: Bender.yml # Compile bitstream $(CAR_XIL_DIR)/flavor_vanilla/out/%.bit: $(xilinx_ips_paths_vanilla) $(CAR_XIL_DIR)/flavor_vanilla/scripts/add_sources.tcl - @if [ "$(GEN_NO_HYPERBUS)" != "1" ] && [ "$(XILINX_ELABORATION_ONLY)" != "1" ]; then echo "Hyperbus not supported yet in this branch"; fi; + @if [ "$(GEN_NO_HYPERBUS)" != "1" ] && [ "$(XILINX_ELABORATION_ONLY)" != "1" ]; then echo "Support for the Hyperbus FMC card is not yet available."; fi; @mkdir -p $(CAR_XIL_DIR)/flavor_vanilla/out cd $(CAR_XIL_DIR)/flavor_vanilla && $(vivado_env) $(VIVADO) $(VIVADO_FLAGS) -source scripts/run.tcl find $(CAR_XIL_DIR)/flavor_vanilla/carfield* -name "*.ltx" -o -name "*.bit" -o -name "*routed.rpt" | xargs -I {} cp {} $(CAR_XIL_DIR)/flavor_vanilla/out