From 728a6a76d2433460266b179cb90c239a27b0aaf7 Mon Sep 17 00:00:00 2001 From: Maciej Kurc Date: Mon, 17 Jun 2019 14:02:31 +0200 Subject: [PATCH] Added bitread and segprint to the Makefile flow Signed-off-by: Maciej Kurc --- minitests/litex/src.vivado/Makefile | 10 +++++++++- minitests/litex/src.vivado/top.tcl | 2 +- minitests/litex/src.yosys/Makefile | 9 ++++++++- minitests/litex/src.yosys/top.tcl | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/minitests/litex/src.vivado/Makefile b/minitests/litex/src.vivado/Makefile index c5692a9a..d4014f1c 100644 --- a/minitests/litex/src.vivado/Makefile +++ b/minitests/litex/src.vivado/Makefile @@ -3,11 +3,13 @@ VIVADO = $(BASE_PATH)/utils/vivado.sh PART = xc7a35tcsg324-1 BIT2FASM_ARGS = --db-root "$(BASE_PATH)/database/artix7" --part "$(BASE_PATH)/database/artix7/$(PART)" --verbose -all: top.fasm +all: top.fasm top.bits segprint.log clean: @rm -f *.bit + @rm -f *.bits @rm -f *.fasm + @rm -f *.log @rm -rf build .PHONY: all clean @@ -25,3 +27,9 @@ top.fasm: top.bit $(BIT2FASM_ARGS) \ top.bit >top.fasm \ || (rm -f top.fasm && exit -1) + +top.bits: top.bit + $(XRAY_BITREAD) -part_file $(BASE_PATH)/database/artix7/$(PART).yaml -o top.bits -z -y top.bit + +segprint.log: top.bits + $(XRAY_SEGPRINT) -z -D -b top.bits > segprint.log diff --git a/minitests/litex/src.vivado/top.tcl b/minitests/litex/src.vivado/top.tcl index c7532dd2..467bb53c 100644 --- a/minitests/litex/src.vivado/top.tcl +++ b/minitests/litex/src.vivado/top.tcl @@ -22,6 +22,6 @@ report_drc -file top_drc.rpt report_timing_summary -datasheet -max_paths 10 -file top_timing.rpt report_power -file top_power.rpt set_property BITSTREAM.CONFIG.SPI_BUSWIDTH 4 [current_design] -write_bitstream -force top.bit +write_bitstream -force top.bit write_cfgmem -force -format bin -interface spix4 -size 16 -loadbit "up 0x0 top.bit" -file top.bin quit diff --git a/minitests/litex/src.yosys/Makefile b/minitests/litex/src.yosys/Makefile index e1e6638f..a22c9da9 100644 --- a/minitests/litex/src.yosys/Makefile +++ b/minitests/litex/src.yosys/Makefile @@ -4,11 +4,12 @@ VIVADO = $(BASE_PATH)/utils/vivado.sh PART = xc7a35tcsg324-1 BIT2FASM_ARGS = --db-root "$(BASE_PATH)/database/artix7" --part "$(BASE_PATH)/database/artix7/$(PART)" --verbose -all: top.fasm +all: top.fasm top.bits segprint.log clean: @rm -f *.edif @rm -f *.bit + @rm -f *.bits @rm -f *.fasm @rm -f *.log @rm -rf build @@ -34,3 +35,9 @@ top.fasm: top.bit $(BIT2FASM_ARGS) \ top.bit >top.fasm \ || (rm -f top.fasm && exit -1) + +top.bits: top.bit + $(XRAY_BITREAD) -part_file $(BASE_PATH)/database/artix7/$(PART).yaml -o top.bits -z -y top.bit + +segprint.log: top.bits + $(XRAY_SEGPRINT) -z -D -b top.bits > segprint.log diff --git a/minitests/litex/src.yosys/top.tcl b/minitests/litex/src.yosys/top.tcl index 1512797c..e4220653 100644 --- a/minitests/litex/src.yosys/top.tcl +++ b/minitests/litex/src.yosys/top.tcl @@ -21,6 +21,6 @@ report_drc -file top_drc.rpt report_timing_summary -datasheet -max_paths 10 -file top_timing.rpt report_power -file top_power.rpt set_property BITSTREAM.CONFIG.SPI_BUSWIDTH 4 [current_design] -write_bitstream -force top.bit +write_bitstream -force top.bit write_cfgmem -force -format bin -interface spix4 -size 16 -loadbit "up 0x0 top.bit" -file top.bin quit