diff --git a/fuzzers/001-part-yaml/.gitignore b/fuzzers/001-part-yaml/.gitignore index 1c232728..7c40c778 100644 --- a/fuzzers/001-part-yaml/.gitignore +++ b/fuzzers/001-part-yaml/.gitignore @@ -1,3 +1,2 @@ -/specimen_*/ -*.yaml +/build /run.ok diff --git a/fuzzers/001-part-yaml/Makefile b/fuzzers/001-part-yaml/Makefile index 57b4faff..82cd2563 100644 --- a/fuzzers/001-part-yaml/Makefile +++ b/fuzzers/001-part-yaml/Makefile @@ -1,16 +1,18 @@ N := 1 -SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) +SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N))) database: $(SPECIMENS) - cp specimen_001/part.yaml ${XRAY_PART}.yaml + mkdir -p build + cp build/specimen_001/part.yaml build/part.yaml + python3 -m utils.xyaml build/part.yaml > build/part.json $(SPECIMENS): Makefile.specimen mkdir -p $@ - $(MAKE) -C $@ -f ../Makefile.specimen + $(MAKE) -C $@ -f ../../Makefile.specimen pushdb: - cp ${XRAY_PART}.yaml ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE) - python3 -m utils.xyaml ${XRAY_PART}.yaml > ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/${XRAY_PART}.json + cp build/part.yaml ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE) + cp build/part.json ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE) run: $(MAKE) clean @@ -19,6 +21,6 @@ run: touch run.ok clean: - rm -rf specimen_[0-9][0-9][0-9]/ *.yaml run.ok + rm -rf build run.ok .PHONY: database pushdb clean run $(SPECIMENS) diff --git a/fuzzers/001-part-yaml/Makefile.specimen b/fuzzers/001-part-yaml/Makefile.specimen index 91ea090f..a0706af8 100644 --- a/fuzzers/001-part-yaml/Makefile.specimen +++ b/fuzzers/001-part-yaml/Makefile.specimen @@ -1,5 +1,5 @@ part.yaml: design.perframecrc.bit ${XRAY_TOOLS_DIR}/gen_part_base_yaml $< -f > $@ -design.bit design.perframecrc.bit: ../generate.tcl - ${XRAY_VIVADO} -mode batch -source ../generate.tcl +design.bit design.perframecrc.bit: ../../generate.tcl + ${XRAY_VIVADO} -mode batch -source ../../generate.tcl diff --git a/fuzzers/001-part-yaml/generate.tcl b/fuzzers/001-part-yaml/generate.tcl index 10c8e02d..9db1ff9e 100644 --- a/fuzzers/001-part-yaml/generate.tcl +++ b/fuzzers/001-part-yaml/generate.tcl @@ -1,6 +1,6 @@ create_project -force -part $::env(XRAY_PART) design design -read_verilog ../top.v +read_verilog ../../top.v synth_design -top top set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_00) IOSTANDARD LVCMOS33" [get_ports clk]