split up bitstream generation from header gen

firmware/Makefile

@@ -2,22 +2,18 @@ PROG = ../software/libcariboulite/build/test/ice40programmer
 filename = top
 pcf_file = ./io.pcf
 
-build:
+top.bin:
 	yosys -p 'synth_ice40 -top top -json $(filename).json' $(filename).v
 	nextpnr-ice40 --lp1k --package qn84 --json $(filename).json --pcf $(pcf_file) --asc $(filename).asc
 	icepack $(filename).asc $(filename).bin
 
+build: top.bin
 	echo "Generating code blob"
 	../software/utils/generate_bin_blob ./top.bin cariboulite_firmware ./h-files/cariboulite_fpga_firmware.h
 
 	echo "Copying dtbo blob h-file to the code directory"
 	cp ./h-files/cariboulite_fpga_firmware.h ../software/libcariboulite/src/
 
-#build:
-#	yosys -p "synth_ice40 -blif $(filename).blif" $(filename).v
-#	arachne-pnr -d 1k -P qn84 -p $(pcf_file) $(filename).blif -o $(filename).asc
-#	icepack $(filename).asc $(filename).bin
-
 prog: build
 	 $(PROG) $(filename).bin