Conflict resolutions:
- tools/bitread.cc: kept master's use-after-free fix (functionally identical
to the branch's own hoisting fix; master's is the reviewed PR #6 version).
- fuzzers/035-iob-ilogic/Makefile and fuzzers/035b-iob-iserdes/Makefile:
combined family lists -> kintex7 zynq7 virtex7.
- fuzzers/Makefile: kept master's SKIP_DSP/HAS_PCIE/HAS_GTP defaults and the
artix7/Zynq-fabric logic; extended the HP-bank condition with virtex7; kept
the branch's HAS_HIGH_RANGE_BANKS gating for the HR-bank fuzzers.
- fuzzers/039-hclk-config/Makefile: combined the branch's HP-only virtex7
path with master's kintex7/zynq7 path; also fixed a broken
$(filter {XRAY_DATABASE},...) (missing $) that silently disabled the
kintex7/zynq7 HCLK_IOI branches on master.
Validated with make dry-runs for XRAY_DATABASE=virtex7/kintex7/zynq7/artix7
(fuzzer flow itself not run: no Virtex-7 Vivado license).
Hans Baier
cb0b0d7412