From be67f173b651aa4591ad48236781ee75e63c5fcb Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Sat, 3 Oct 2020 15:32:21 -0700 Subject: [PATCH] Update flash programming configuration for ExaNIC X10 and X25 --- fpga/mqnic/ExaNIC_X10/fpga/fpga/Makefile | 4 ++-- fpga/mqnic/ExaNIC_X25/fpga_10g/fpga.xdc | 1 - fpga/mqnic/ExaNIC_X25/fpga_10g/fpga/Makefile | 4 ++-- fpga/mqnic_tdma/ExaNIC_X10/fpga/fpga/Makefile | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fpga/mqnic/ExaNIC_X10/fpga/fpga/Makefile b/fpga/mqnic/ExaNIC_X10/fpga/fpga/Makefile index 626ef3e0b..31a6c0919 100644 --- a/fpga/mqnic/ExaNIC_X10/fpga/fpga/Makefile +++ b/fpga/mqnic/ExaNIC_X10/fpga/fpga/Makefile @@ -92,7 +92,7 @@ program: $(FPGA_TOP).bit vivado -nojournal -nolog -mode batch -source program.tcl %.mcs %.prm: %.bit - echo "write_cfgmem -force -format mcs -size 32 -interface BPIx16 -loadbit {up 0x0000000 $*.bit} -checksum -file $*.mcs" > generate_mcs.tcl + echo "write_cfgmem -force -format mcs -size 32 -interface BPIx16 -loadbit {up 0x00800000 $*.bit} -checksum -file $*.mcs" > generate_mcs.tcl echo "exit" >> generate_mcs.tcl vivado -nojournal -nolog -mode batch -source generate_mcs.tcl mkdir -p rev @@ -119,7 +119,7 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm 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.BPI_RS_PINS {none} [current_hw_cfgmem]" >> flash.tcl + echo "set_property PROGRAM.BPI_RS_PINS {24:23} [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 diff --git a/fpga/mqnic/ExaNIC_X25/fpga_10g/fpga.xdc b/fpga/mqnic/ExaNIC_X25/fpga_10g/fpga.xdc index f5b8b9b22..cdf0fab5e 100644 --- a/fpga/mqnic/ExaNIC_X25/fpga_10g/fpga.xdc +++ b/fpga/mqnic/ExaNIC_X25/fpga_10g/fpga.xdc @@ -9,7 +9,6 @@ set_property BITSTREAM.CONFIG.UNUSEDPIN Pullup [current_design] set_property BITSTREAM.CONFIG.CONFIGRATE 31.9 [current_design] set_property BITSTREAM.CONFIG.BPI_PAGE_SIZE 8 [current_design] set_property BITSTREAM.CONFIG.BPI_1ST_READ_CYCLE 4 [current_design] -set_property BITSTREAM.CONFIG.REVISIONSELECT_TRISTATE Enable [current_design] set_property CONFIG_MODE BPI16 [current_design] set_property BITSTREAM.CONFIG.OVERTEMPSHUTDOWN Enable [current_design] diff --git a/fpga/mqnic/ExaNIC_X25/fpga_10g/fpga/Makefile b/fpga/mqnic/ExaNIC_X25/fpga_10g/fpga/Makefile index 10c19929e..a791ed99c 100644 --- a/fpga/mqnic/ExaNIC_X25/fpga_10g/fpga/Makefile +++ b/fpga/mqnic/ExaNIC_X25/fpga_10g/fpga/Makefile @@ -95,7 +95,7 @@ program: $(FPGA_TOP).bit vivado -nojournal -nolog -mode batch -source program.tcl %.mcs %.prm: %.bit - echo "write_cfgmem -force -format mcs -size 32 -interface BPIx16 -loadbit {up 0x0000000 $*.bit} -checksum -file $*.mcs" > generate_mcs.tcl + echo "write_cfgmem -force -format mcs -size 32 -interface BPIx16 -loadbit {up 0x00800000 $*.bit} -checksum -file $*.mcs" > generate_mcs.tcl echo "exit" >> generate_mcs.tcl vivado -nojournal -nolog -mode batch -source generate_mcs.tcl mkdir -p rev @@ -122,7 +122,7 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm 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.BPI_RS_PINS {none} [current_hw_cfgmem]" >> flash.tcl + echo "set_property PROGRAM.BPI_RS_PINS {24:23} [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 diff --git a/fpga/mqnic_tdma/ExaNIC_X10/fpga/fpga/Makefile b/fpga/mqnic_tdma/ExaNIC_X10/fpga/fpga/Makefile index 9228360c7..03f50180a 100644 --- a/fpga/mqnic_tdma/ExaNIC_X10/fpga/fpga/Makefile +++ b/fpga/mqnic_tdma/ExaNIC_X10/fpga/fpga/Makefile @@ -93,7 +93,7 @@ program: $(FPGA_TOP).bit vivado -nojournal -nolog -mode batch -source program.tcl %.mcs %.prm: %.bit - echo "write_cfgmem -force -format mcs -size 32 -interface BPIx16 -loadbit {up 0x0000000 $*.bit} -checksum -file $*.mcs" > generate_mcs.tcl + echo "write_cfgmem -force -format mcs -size 32 -interface BPIx16 -loadbit {up 0x00800000 $*.bit} -checksum -file $*.mcs" > generate_mcs.tcl echo "exit" >> generate_mcs.tcl vivado -nojournal -nolog -mode batch -source generate_mcs.tcl mkdir -p rev @@ -120,7 +120,7 @@ flash: $(FPGA_TOP).mcs $(FPGA_TOP).prm 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.BPI_RS_PINS {none} [current_hw_cfgmem]" >> flash.tcl + echo "set_property PROGRAM.BPI_RS_PINS {24:23} [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