fpga: Removed hyperbus for this PR

pulp-platform · Nov 14, 2024 · 7e0f929 · 7e0f929
1 parent eaa86e5
commit 7e0f929
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 231 deletions.
diff --git a/docs/tg/xilinx.md b/docs/tg/xilinx.md
@@ -8,8 +8,10 @@ Additionally, for on-chip debugging you need:
 
 We currently provide working setups for:
 
-- Xilinx VCU128 with Vivado `>= 2020.2`
-- Xilinx VCU118 with Vivado `>= 2020.2`
+- Xilinx VCU128 with Vivado `== 2020.2`
+- Xilinx VCU118 with Vivado `== 2020.2`
+
+**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.
 
@@ -25,6 +27,16 @@ 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
+
+The recommended command to build a bitstream (for VCU128) is
+
+```bash
+make car-xil-all XILINX_FLAVOR=bd VIVADO="vitis-2020.2 vivado" VIVADO_MODE=gui XILINX_BOARD=vcu128 GEN_NO_HYPERBUS=1 GEN_EXT_JTAG=1 CARFIELD_CONFIG=carfield_l2dual_spatz_periph
+```
+
+Please find below more explanations.
+
 ## Building the vanilla bistream (VCU128 only)
 
 Due to the structure of the Makefile flow. All the following commands are to be executed at the root

diff --git a/target/xilinx/flavor_bd/constraints/vcu118_hyperbus.xdc b/target/xilinx/flavor_bd/constraints/vcu118_hyperbus.xdc
diff --git a/target/xilinx/flavor_bd/constraints/vcu128_hyperbus.xdc b/target/xilinx/flavor_bd/constraints/vcu128_hyperbus.xdc
diff --git a/target/xilinx/flavor_bd/scripts/carfield_bd_hyperbus.tcl b/target/xilinx/flavor_bd/scripts/carfield_bd_hyperbus.tcl
diff --git a/target/xilinx/flavor_bd/scripts/run.tcl b/target/xilinx/flavor_bd/scripts/run.tcl
@@ -32,12 +32,6 @@ if {[info exists ::env(GEN_EXT_JTAG)] && ($::env(GEN_EXT_JTAG)==1)} {
   import_files -fileset constrs_1 -norecurse constraints/$::env(XILINX_BOARD)_ext_jtag.xdc
 }
 
-# Add the hyperbus pins to block design
-if {![info exists ::env(GEN_NO_HYPERBUS)] || ($::env(GEN_NO_HYPERBUS)==0)} {
-  source scripts/carfield_bd_hyperbus.tcl
-  import_files -fileset constrs_1 -norecurse constraints/$::env(XILINX_BOARD)_hyperbus.xdc
-}
-
 make_wrapper -files [get_files $project/$project.srcs/sources_1/bd/design_1/design_1.bd] -top
 add_files -norecurse $project/$project.gen/sources_1/bd/design_1/hdl/design_1_wrapper.v
 

diff --git a/target/xilinx/flavor_vanilla/constraints/vcu128_hyperbus.xdc b/target/xilinx/flavor_vanilla/constraints/vcu128_hyperbus.xdc
diff --git a/target/xilinx/flavor_vanilla/flavor_vanilla.mk b/target/xilinx/flavor_vanilla/flavor_vanilla.mk
@@ -46,6 +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" ]; then echo "Hyperbus not supported yet in this branch"; 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