Merge AU200, AU250, and VCU1525 designs

Signed-off-by: Alex Forencich <[email protected]>
alexforencich · Oct 13, 2023 · 49513b4 · 49513b4
1 parent e84da8d
commit 49513b4
Show file tree

Hide file tree

Showing 42 changed files with 155 additions and 7,343 deletions.
diff --git a/example/AU200/fpga_25g/README.md b/example/AU200/fpga_25g/README.md
@@ -1,29 +1,28 @@
-# Verilog Ethernet Alveo U200 Example Design
+# Verilog Ethernet Alveo U200/Alveo U250/VCU1525 Example Design
 
 ## Introduction
 
-This example design targets the Xilinx Alveo U200 FPGA board.
+This example design targets the Xilinx Alveo U200/Alveo U250/VCU1525 FPGA board.
 
-The design by default listens to UDP port 1234 at IP address 192.168.1.128 and
-will echo back any packets received.  The design will also respond correctly
-to ARP requests.
+The design by default listens to UDP port 1234 at IP address 192.168.1.128 and will echo back any packets received.  The design will also respond correctly to ARP requests.
 
-*  FPGA: xcu200-fsgd2104-2-e
-*  PHY: 10G BASE-R PHY IP core and internal GTY transceiver
+* FPGA
+  * AU200: xcu200-fsgd2104-2-e
+  * AU250: xcu250-fsgd2104-2-e
+  * VCU1525: xcvu9p-fsgd2104-2L-e
+* PHY: 10G BASE-R PHY IP core and internal GTY transceiver
 
 ## How to build
 
-Run make to build.  Ensure that the Xilinx Vivado toolchain components are
-in PATH.  
+Run make to build.  Ensure that the Xilinx Vivado toolchain components are in PATH.
 
 ## How to test
 
-Run make program to program the Alveo U200 board with Vivado.  Then run
+Run make program to program the FPGA board with Vivado.  Then run
 
     netcat -u 192.168.1.128 1234
 
-to open a UDP connection to port 1234.  Any text entered into netcat will be
-echoed back after pressing enter.
+to open a UDP connection to port 1234.  Any text entered into netcat will be echoed back after pressing enter.
 
 It is also possible to use hping to test the design by running
 

diff --git a/example/AU200/fpga_25g/fpga.xdc b/example/AU200/fpga_25g/fpga.xdc
@@ -1,5 +1,7 @@
-# XDC constraints for the Xilinx Alveo U200 board
-# part: xcu200-fsgd2104-2-e
+# XDC constraints for Xilinx AU200/AU250/VCU1525
+# AU200 part: xcu200-fsgd2104-2-e
+# AU250 part: xcu250-figd2104-2-e
+# VCU1525 part: xcvu9p-fsgd2104-2L-e
 
 # General configuration
 set_property CFGBVS GND                                [current_design]

diff --git a/example/AU200/fpga_25g/fpga/Makefile → example/AU200/fpga_25g/fpga_AU200/Makefile b/example/AU200/fpga_25g/fpga/Makefile → example/AU200/fpga_25g/fpga_AU200/Makefile
@@ -112,4 +112,3 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	echo "boot_hw_device [current_hw_device]" >> flash.tcl
 	echo "exit" >> flash.tcl
 	vivado -nojournal -nolog -mode batch -source flash.tcl
-
diff --git a/example/AU200/fpga_25g/fpga/config.tcl → example/AU200/fpga_25g/fpga_AU200/config.tcl b/example/AU200/fpga_25g/fpga/config.tcl → example/AU200/fpga_25g/fpga_AU200/config.tcl
diff --git a/example/AU200/fpga_25g/fpga_10g/Makefile → ...le/AU200/fpga_25g/fpga_AU200_10g/Makefile b/example/AU200/fpga_25g/fpga_10g/Makefile → ...le/AU200/fpga_25g/fpga_AU200_10g/Makefile
@@ -112,4 +112,3 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	echo "boot_hw_device [current_hw_device]" >> flash.tcl
 	echo "exit" >> flash.tcl
 	vivado -nojournal -nolog -mode batch -source flash.tcl
-
diff --git a/example/AU200/fpga_25g/fpga_10g/config.tcl → .../AU200/fpga_25g/fpga_AU200_10g/config.tcl b/example/AU200/fpga_25g/fpga_10g/config.tcl → .../AU200/fpga_25g/fpga_AU200_10g/config.tcl
diff --git a/example/AU250/fpga_25g/fpga/Makefile → example/AU200/fpga_25g/fpga_AU250/Makefile b/example/AU250/fpga_25g/fpga/Makefile → example/AU200/fpga_25g/fpga_AU250/Makefile
@@ -112,4 +112,3 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	echo "boot_hw_device [current_hw_device]" >> flash.tcl
 	echo "exit" >> flash.tcl
 	vivado -nojournal -nolog -mode batch -source flash.tcl
-
diff --git a/example/AU250/fpga_25g/fpga/config.tcl → example/AU200/fpga_25g/fpga_AU250/config.tcl b/example/AU250/fpga_25g/fpga/config.tcl → example/AU200/fpga_25g/fpga_AU250/config.tcl
diff --git a/example/AU250/fpga_25g/fpga_10g/Makefile → ...le/AU200/fpga_25g/fpga_AU250_10g/Makefile b/example/AU250/fpga_25g/fpga_10g/Makefile → ...le/AU200/fpga_25g/fpga_AU250_10g/Makefile
@@ -112,4 +112,3 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	echo "boot_hw_device [current_hw_device]" >> flash.tcl
 	echo "exit" >> flash.tcl
 	vivado -nojournal -nolog -mode batch -source flash.tcl
-
diff --git a/example/AU250/fpga_25g/fpga_10g/config.tcl → .../AU200/fpga_25g/fpga_AU250_10g/config.tcl b/example/AU250/fpga_25g/fpga_10g/config.tcl → .../AU200/fpga_25g/fpga_AU250_10g/config.tcl
diff --git a/example/VCU1525/fpga_25g/fpga/Makefile → example/AU200/fpga_25g/fpga_VCU1525/Makefile b/example/VCU1525/fpga_25g/fpga/Makefile → example/AU200/fpga_25g/fpga_VCU1525/Makefile
@@ -65,6 +65,27 @@ CONFIG_TCL_FILES = ./config.tcl
 
 include ../common/vivado.mk
 
+%_fallback.bit: %.bit
+	echo "open_project $*.xpr" > generate_fallback_bit.tcl
+	echo "open_run impl_1" >> generate_fallback_bit.tcl
+	echo "startgroup" >> generate_fallback_bit.tcl
+	echo "set_property BITSTREAM.CONFIG.CONFIGFALLBACK ENABLE [current_design]" >> generate_fallback_bit.tcl
+	echo "set_property BITSTREAM.CONFIG.TIMER_CFG 0x03000000 [current_design]" >> generate_fallback_bit.tcl
+	echo "set_property BITSTREAM.CONFIG.NEXT_CONFIG_REBOOT ENABLE [current_design]" >> generate_fallback_bit.tcl
+	echo "set_property BITSTREAM.CONFIG.NEXT_CONFIG_ADDR 0x04000000 [current_design]" >> generate_fallback_bit.tcl
+	echo "endgroup" >> generate_fallback_bit.tcl
+	echo "write_bitstream -verbose -force $*_fallback.bit" >> generate_fallback_bit.tcl
+	echo "undo" >> generate_fallback_bit.tcl
+	echo "exit" >> generate_fallback_bit.tcl
+	vivado -nojournal -nolog -mode batch -source generate_fallback_bit.tcl
+	mkdir -p rev
+	EXT=bit; COUNT=100; \
+	while [ -e rev/$*_rev$$COUNT.$$EXT ]; \
+	do COUNT=$$((COUNT+1)); done; \
+	COUNT=$$((COUNT-1)); \
+	cp $@ rev/$*_fallback_rev$$COUNT.$$EXT; \
+	echo "Output: rev/$*_fallback_rev$$COUNT.$$EXT";
+
 program: $(FPGA_TOP).bit
 	echo "open_hw" > program.tcl
 	echo "connect_hw_server" >> program.tcl
@@ -89,6 +110,32 @@ program: $(FPGA_TOP).bit
 	do cp $*$$x rev/$*_rev$$COUNT$$x; \
 	echo "Output: rev/$*_rev$$COUNT$$x"; done;
 
+%_fallback.mcs %_fallback.prm: %_fallback.bit
+	echo "write_cfgmem -force -format mcs -size 128 -interface SPIx4 -loadbit {up 0x00000000 $*_fallback.bit} -checksum -file $*_fallback.mcs" > generate_fallback_mcs.tcl
+	echo "exit" >> generate_fallback_mcs.tcl
+	vivado -nojournal -nolog -mode batch -source generate_fallback_mcs.tcl
+	mkdir -p rev
+	COUNT=100; \
+	while [ -e rev/$*_rev$$COUNT.bit ]; \
+	do COUNT=$$((COUNT+1)); done; \
+	COUNT=$$((COUNT-1)); \
+	for x in .mcs .prm; \
+	do cp $*_fallback$$x rev/$*_fallback_rev$$COUNT$$x; \
+	echo "Output: rev/$*_fallback_rev$$COUNT$$x"; done;
+
+%_full.mcs %_full.prm: %_fallback.bit %.bit
+	echo "write_cfgmem -force -format mcs -size 128 -interface SPIx4 -loadbit {up 0x00000000 $*_fallback.bit up 0x04000000 $*.bit} -checksum -file $*_full.mcs" > generate_full_mcs.tcl
+	echo "exit" >> generate_full_mcs.tcl
+	vivado -nojournal -nolog -mode batch -source generate_full_mcs.tcl
+	mkdir -p rev
+	COUNT=100; \
+	while [ -e rev/$*_rev$$COUNT.bit ]; \
+	do COUNT=$$((COUNT+1)); done; \
+	COUNT=$$((COUNT-1)); \
+	for x in .mcs .prm; \
+	do cp $*_full$$x rev/$*_full_rev$$COUNT$$x; \
+	echo "Output: rev/$*_full_rev$$COUNT$$x"; done;
+
 flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	echo "open_hw" > flash.tcl
 	echo "connect_hw_server" >> flash.tcl
@@ -113,3 +160,26 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	echo "exit" >> flash.tcl
 	vivado -nojournal -nolog -mode batch -source flash.tcl
 
+flash%: $(FPGA_TOP)%.mcs $(FPGA_TOP)%.prm
+	echo "open_hw" > flash$*.tcl
+	echo "connect_hw_server" >> flash$*.tcl
+	echo "open_hw_target" >> flash$*.tcl
+	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash$*.tcl
+	echo "refresh_hw_device -update_hw_probes false [current_hw_device]" >> flash$*.tcl
+	echo "create_hw_cfgmem -hw_device [current_hw_device] [lindex [get_cfgmem_parts {mt25qu01g-spi-x1_x2_x4}] 0]" >> flash$*.tcl
+	echo "current_hw_cfgmem -hw_device [current_hw_device] [get_property PROGRAM.HW_CFGMEM [current_hw_device]]" >> flash$*.tcl
+	echo "set_property PROGRAM.FILES [list \"$(FPGA_TOP)$*.mcs\"] [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.PRM_FILES [list \"$(FPGA_TOP)$*.prm\"] [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.ERASE 1 [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.CFG_PROGRAM 1 [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.VERIFY 1 [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.CHECKSUM 0 [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.ADDRESS_RANGE {use_file} [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.UNUSED_PIN_TERMINATION {pull-none} [current_hw_cfgmem]" >> flash$*.tcl
+	echo "create_hw_bitstream -hw_device [current_hw_device] [get_property PROGRAM.HW_CFGMEM_BITFILE [current_hw_device]]" >> flash$*.tcl
+	echo "program_hw_devices [current_hw_device]" >> flash$*.tcl
+	echo "refresh_hw_device [current_hw_device]" >> flash$*.tcl
+	echo "program_hw_cfgmem -hw_cfgmem [current_hw_cfgmem]" >> flash$*.tcl
+	echo "boot_hw_device [current_hw_device]" >> flash$*.tcl
+	echo "exit" >> flash$*.tcl
+	vivado -nojournal -nolog -mode batch -source flash$*.tcl
diff --git a/example/VCU1525/fpga_25g/fpga/config.tcl → ...le/AU200/fpga_25g/fpga_VCU1525/config.tcl b/example/VCU1525/fpga_25g/fpga/config.tcl → ...le/AU200/fpga_25g/fpga_VCU1525/config.tcl
diff --git a/example/VCU1525/fpga_25g/fpga_10g/Makefile → .../AU200/fpga_25g/fpga_VCU1525_10g/Makefile b/example/VCU1525/fpga_25g/fpga_10g/Makefile → .../AU200/fpga_25g/fpga_VCU1525_10g/Makefile
@@ -65,6 +65,27 @@ CONFIG_TCL_FILES = ./config.tcl
 
 include ../common/vivado.mk
 
+%_fallback.bit: %.bit
+	echo "open_project $*.xpr" > generate_fallback_bit.tcl
+	echo "open_run impl_1" >> generate_fallback_bit.tcl
+	echo "startgroup" >> generate_fallback_bit.tcl
+	echo "set_property BITSTREAM.CONFIG.CONFIGFALLBACK ENABLE [current_design]" >> generate_fallback_bit.tcl
+	echo "set_property BITSTREAM.CONFIG.TIMER_CFG 0x03000000 [current_design]" >> generate_fallback_bit.tcl
+	echo "set_property BITSTREAM.CONFIG.NEXT_CONFIG_REBOOT ENABLE [current_design]" >> generate_fallback_bit.tcl
+	echo "set_property BITSTREAM.CONFIG.NEXT_CONFIG_ADDR 0x04000000 [current_design]" >> generate_fallback_bit.tcl
+	echo "endgroup" >> generate_fallback_bit.tcl
+	echo "write_bitstream -verbose -force $*_fallback.bit" >> generate_fallback_bit.tcl
+	echo "undo" >> generate_fallback_bit.tcl
+	echo "exit" >> generate_fallback_bit.tcl
+	vivado -nojournal -nolog -mode batch -source generate_fallback_bit.tcl
+	mkdir -p rev
+	EXT=bit; COUNT=100; \
+	while [ -e rev/$*_rev$$COUNT.$$EXT ]; \
+	do COUNT=$$((COUNT+1)); done; \
+	COUNT=$$((COUNT-1)); \
+	cp $@ rev/$*_fallback_rev$$COUNT.$$EXT; \
+	echo "Output: rev/$*_fallback_rev$$COUNT.$$EXT";
+
 program: $(FPGA_TOP).bit
 	echo "open_hw" > program.tcl
 	echo "connect_hw_server" >> program.tcl
@@ -89,6 +110,32 @@ program: $(FPGA_TOP).bit
 	do cp $*$$x rev/$*_rev$$COUNT$$x; \
 	echo "Output: rev/$*_rev$$COUNT$$x"; done;
 
+%_fallback.mcs %_fallback.prm: %_fallback.bit
+	echo "write_cfgmem -force -format mcs -size 128 -interface SPIx4 -loadbit {up 0x00000000 $*_fallback.bit} -checksum -file $*_fallback.mcs" > generate_fallback_mcs.tcl
+	echo "exit" >> generate_fallback_mcs.tcl
+	vivado -nojournal -nolog -mode batch -source generate_fallback_mcs.tcl
+	mkdir -p rev
+	COUNT=100; \
+	while [ -e rev/$*_rev$$COUNT.bit ]; \
+	do COUNT=$$((COUNT+1)); done; \
+	COUNT=$$((COUNT-1)); \
+	for x in .mcs .prm; \
+	do cp $*_fallback$$x rev/$*_fallback_rev$$COUNT$$x; \
+	echo "Output: rev/$*_fallback_rev$$COUNT$$x"; done;
+
+%_full.mcs %_full.prm: %_fallback.bit %.bit
+	echo "write_cfgmem -force -format mcs -size 128 -interface SPIx4 -loadbit {up 0x00000000 $*_fallback.bit up 0x04000000 $*.bit} -checksum -file $*_full.mcs" > generate_full_mcs.tcl
+	echo "exit" >> generate_full_mcs.tcl
+	vivado -nojournal -nolog -mode batch -source generate_full_mcs.tcl
+	mkdir -p rev
+	COUNT=100; \
+	while [ -e rev/$*_rev$$COUNT.bit ]; \
+	do COUNT=$$((COUNT+1)); done; \
+	COUNT=$$((COUNT-1)); \
+	for x in .mcs .prm; \
+	do cp $*_full$$x rev/$*_full_rev$$COUNT$$x; \
+	echo "Output: rev/$*_full_rev$$COUNT$$x"; done;
+
 flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	echo "open_hw" > flash.tcl
 	echo "connect_hw_server" >> flash.tcl
@@ -113,3 +160,26 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
 	echo "exit" >> flash.tcl
 	vivado -nojournal -nolog -mode batch -source flash.tcl
 
+flash%: $(FPGA_TOP)%.mcs $(FPGA_TOP)%.prm
+	echo "open_hw" > flash$*.tcl
+	echo "connect_hw_server" >> flash$*.tcl
+	echo "open_hw_target" >> flash$*.tcl
+	echo "current_hw_device [lindex [get_hw_devices] 0]" >> flash$*.tcl
+	echo "refresh_hw_device -update_hw_probes false [current_hw_device]" >> flash$*.tcl
+	echo "create_hw_cfgmem -hw_device [current_hw_device] [lindex [get_cfgmem_parts {mt25qu01g-spi-x1_x2_x4}] 0]" >> flash$*.tcl
+	echo "current_hw_cfgmem -hw_device [current_hw_device] [get_property PROGRAM.HW_CFGMEM [current_hw_device]]" >> flash$*.tcl
+	echo "set_property PROGRAM.FILES [list \"$(FPGA_TOP)$*.mcs\"] [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.PRM_FILES [list \"$(FPGA_TOP)$*.prm\"] [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.ERASE 1 [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.CFG_PROGRAM 1 [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.VERIFY 1 [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.CHECKSUM 0 [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.ADDRESS_RANGE {use_file} [current_hw_cfgmem]" >> flash$*.tcl
+	echo "set_property PROGRAM.UNUSED_PIN_TERMINATION {pull-none} [current_hw_cfgmem]" >> flash$*.tcl
+	echo "create_hw_bitstream -hw_device [current_hw_device] [get_property PROGRAM.HW_CFGMEM_BITFILE [current_hw_device]]" >> flash$*.tcl
+	echo "program_hw_devices [current_hw_device]" >> flash$*.tcl
+	echo "refresh_hw_device [current_hw_device]" >> flash$*.tcl
+	echo "program_hw_cfgmem -hw_cfgmem [current_hw_cfgmem]" >> flash$*.tcl
+	echo "boot_hw_device [current_hw_device]" >> flash$*.tcl
+	echo "exit" >> flash$*.tcl
+	vivado -nojournal -nolog -mode batch -source flash$*.tcl
diff --git a/example/VCU1525/fpga_25g/fpga_10g/config.tcl → ...U200/fpga_25g/fpga_VCU1525_10g/config.tcl b/example/VCU1525/fpga_25g/fpga_10g/config.tcl → ...U200/fpga_25g/fpga_VCU1525_10g/config.tcl
diff --git a/example/AU250/fpga_25g/Makefile b/example/AU250/fpga_25g/Makefile
diff --git a/example/AU250/fpga_25g/README.md b/example/AU250/fpga_25g/README.md
Original file line number	Diff line number	Diff line change
Expand Up		@@ -112,4 +112,3 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm
		echo "boot_hw_device [current_hw_device]" >> flash.tcl
		echo "exit" >> flash.tcl
		vivado -nojournal -nolog -mode batch -source flash.tcl