Merge branch 'master' into eddie/pr1352

diff --cc Makefile
index 227c87bbd6a8d3539c3b259ffc38f7b455f16164,6f5184596f8efe89c0d5fa205fcdb7abadfacafa..14af2bc11f5cca868742e2f365dd3693facf9a74
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -714,7 -715,7 +715,8 @@@ test: $(TARGETS) $(EXTRA_TARGETS
        +cd tests/arch && bash run-test.sh
        +cd tests/ice40 && bash run-test.sh $(SEEDOPT)
        +cd tests/rpc && bash run-test.sh
 +      +cd tests/ecp5 && bash run-test.sh $(SEEDOPT)
+       +cd tests/xilinx && bash run-test.sh $(SEEDOPT)
        @echo ""
        @echo "  Passed \"make test\"."
        @echo ""