From ca43729f124466b816f922842353feeb3f6f8e84 Mon Sep 17 00:00:00 2001
From: Aki Van Ness <aki@lethalbit.net>
Date: Thu, 15 Sep 2022 06:32:45 -0400
Subject: Replaced instances of `arachne-pnr` with the `nextpnr-ice40` 
 equivalent

---
 examples/icestick/Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'examples/icestick/Makefile')

diff --git a/examples/icestick/Makefile b/examples/icestick/Makefile
index 58f26b9..d6a649b 100644
--- a/examples/icestick/Makefile
+++ b/examples/icestick/Makefile
@@ -4,14 +4,15 @@ PROJ = example
 
 PIN_DEF = icestick.pcf
 DEVICE = hx1k
+PACKAGE = tq144
 
 all: $(PROJ).rpt $(PROJ).bin
 
-%.blif: %.v
-	yosys -p 'synth_ice40 -top top -blif $@' $<
+%.json: %.v
+	yosys -p 'synth_ice40 -top top -json $@' $<
 
-%.asc: $(PIN_DEF) %.blif
-	arachne-pnr -d $(subst hx,,$(subst lp,,$(DEVICE))) -o $@ -p $^
+%.asc: $(PIN_DEF) %.json
+	nextpnr-ice40 --$(DEVICE) --package $(PACKAGE) --asc $@ --pcf $< --json $*.json
 
 %.bin: %.asc
 	icepack $< $@
@@ -25,8 +26,8 @@ all: $(PROJ).rpt $(PROJ).bin
 %_tb.vcd: %_tb
 	vvp -N $< +vcd=$@
 
-%_syn.v: %.blif
-	yosys -p 'read_blif -wideports $^; write_verilog $@'
+%_syn.v: %.json
+	yosys -p 'read_json $^; write_verilog $@'
 
 %_syntb: %_tb.v %_syn.v
 	iverilog -o $@ $^ `yosys-config --datdir/ice40/cells_sim.v`
@@ -46,7 +47,7 @@ sudo-prog: $(PROJ).bin
 	sudo iceprog $<
 
 clean:
-	rm -f $(PROJ).blif $(PROJ).asc $(PROJ).rpt $(PROJ).bin
+	rm -f $(PROJ).json $(PROJ).asc $(PROJ).rpt $(PROJ).bin
 
 .SECONDARY:
 .PHONY: all prog clean
-- 
cgit v1.2.3