Fix makefile for RFSoC4x2 and ZCU111

Author: dnorthcote

Diff for: boards/RFSoC4x2/rfsoc_qpsk/Makefile

@@ -1,10 +1,11 @@
-all: block_design bitstream clean
+all: bitstream clean
 
 block_design:
 	vivado -mode batch -source make_block_design.tcl -notrace
 
 bitstream:
+	$(MAKE) block_design
 	vivado -mode batch -source make_bitstream.tcl -notrace
 
 clean:
-	rm -rf block_design *.jou *.log NA .Xil
+	rm -rf block_design *.jou *.log NA .Xil || true

Diff for: boards/ZCU111/rfsoc_qpsk/Makefile

@@ -1,10 +1,11 @@
-all: block_design bitstream clean
+all: bitstream clean
 
 block_design:
 	vivado -mode batch -source make_block_design.tcl -notrace
 
 bitstream:
+	$(MAKE) block_design
 	vivado -mode batch -source make_bitstream.tcl -notrace
 
 clean:
-	rm -rf block_design *.jou *.log NA .Xil
+	rm -rf block_design *.jou *.log NA .Xil || true