From 81c33a343ffce5eab897d0a5a7d228bfcb08aaf4 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 1 Feb 2016 23:32:03 +0100
Subject: Timing models for LP and HX devices

---
 examples/hx8kboard/Makefile  | 6 +++---
 examples/iceblink/.gitignore | 4 ++++
 examples/iceblink/Makefile   | 9 ++++++---
 examples/icestick/Makefile   | 6 +++---
 4 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 examples/iceblink/.gitignore

(limited to 'examples')

diff --git a/examples/hx8kboard/Makefile b/examples/hx8kboard/Makefile
index 0241807..bcecdf2 100644
--- a/examples/hx8kboard/Makefile
+++ b/examples/hx8kboard/Makefile
@@ -1,6 +1,6 @@
 PROJ = example
 PIN_DEF = hx8kboard.pcf
-DEVICE = 8k
+DEVICE = hx8k
 
 all: $(PROJ).rpt $(PROJ).bin
 
@@ -8,13 +8,13 @@ all: $(PROJ).rpt $(PROJ).bin
 	yosys -p 'synth_ice40 -top top -blif $@' $<
 
 %.asc: $(PIN_DEF) %.blif
-	arachne-pnr -d $(DEVICE) -o $@ -p $^
+	arachne-pnr -d $(subst hx,,$(subst lp,,$(DEVICE))) -o $@ -p $^
 
 %.bin: %.asc
 	icepack $< $@
 
 %.rpt: %.asc
-	icetime -mtr $@ $<
+	icetime -d $(DEVICE) -mtr $@ $<
 
 prog: $(PROJ).bin
 	iceprog $<
diff --git a/examples/iceblink/.gitignore b/examples/iceblink/.gitignore
new file mode 100644
index 0000000..c1fa30b
--- /dev/null
+++ b/examples/iceblink/.gitignore
@@ -0,0 +1,4 @@
+example.bin
+example.blif
+example.asc
+example.rpt
diff --git a/examples/iceblink/Makefile b/examples/iceblink/Makefile
index 8f908a8..25ffe3c 100644
--- a/examples/iceblink/Makefile
+++ b/examples/iceblink/Makefile
@@ -1,18 +1,21 @@
 PROJ = example
 PIN_DEF = iceblink.pcf
-DEVICE = 1k
+DEVICE = hx1k
 
-all: $(PROJ).bin
+all: $(PROJ).rpt $(PROJ).bin
 
 %.blif: %.v
 	yosys -p 'synth_ice40 -top top -blif $@' $<
 
 %.asc: $(PIN_DEF) %.blif
-	arachne-pnr -d $(DEVICE) -o $@ -p $^ -P vq100
+	arachne-pnr -d $(subst hx,,$(subst lp,,$(DEVICE))) -o $@ -p $^ -P vq100
 
 %.bin: %.asc
 	icepack $< $@
 
+%.rpt: %.asc
+	icetime -d $(DEVICE) -mtr $@ $<
+
 prog: $(PROJ).bin
 	iCEburn.py  -e -v -w  $<
 
diff --git a/examples/icestick/Makefile b/examples/icestick/Makefile
index a2ecbc6..f40c8a3 100644
--- a/examples/icestick/Makefile
+++ b/examples/icestick/Makefile
@@ -1,6 +1,6 @@
 PROJ = example
 PIN_DEF = icestick.pcf
-DEVICE = 1k
+DEVICE = hx1k
 
 all: $(PROJ).rpt $(PROJ).bin
 
@@ -8,13 +8,13 @@ all: $(PROJ).rpt $(PROJ).bin
 	yosys -p 'synth_ice40 -top top -blif $@' $<
 
 %.asc: $(PIN_DEF) %.blif
-	arachne-pnr -d $(DEVICE) -o $@ -p $^
+	arachne-pnr -d $(subst hx,,$(subst lp,,$(DEVICE))) -o $@ -p $^
 
 %.bin: %.asc
 	icepack $< $@
 
 %.rpt: %.asc
-	icetime -mtr $@ $<
+	icetime -d $(DEVICE) -mtr $@ $<
 
 prog: $(PROJ).bin
 	iceprog $<
-- 
cgit v1.2.3