From 9184fbdf404c0e94326919c92a27d3292994cdf1 Mon Sep 17 00:00:00 2001
From: David Shah <davey1576@gmail.com>
Date: Mon, 20 Nov 2017 09:51:03 +0000
Subject: Tidy up 5k examples

---
 examples/up5k/.gitignore     |  4 ----
 examples/up5k/Makefile       | 36 ------------------------------------
 examples/up5k/example.v      | 10 ----------
 examples/up5k/up5k.pcf       |  3 ---
 examples/up5k_mac16/Makefile | 36 ++++++++++++++++++++++++++++++++++++
 examples/up5k_rgb/Makefile   | 12 ++++++------
 examples/up5k_rgb/rgb.v      |  8 ++++----
 7 files changed, 46 insertions(+), 63 deletions(-)
 delete mode 100644 examples/up5k/.gitignore
 delete mode 100644 examples/up5k/Makefile
 delete mode 100644 examples/up5k/example.v
 delete mode 100644 examples/up5k/up5k.pcf
 create mode 100644 examples/up5k_mac16/Makefile

(limited to 'examples')

diff --git a/examples/up5k/.gitignore b/examples/up5k/.gitignore
deleted file mode 100644
index c1fa30b..0000000
--- a/examples/up5k/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-example.bin
-example.blif
-example.asc
-example.rpt
diff --git a/examples/up5k/Makefile b/examples/up5k/Makefile
deleted file mode 100644
index ea16f06..0000000
--- a/examples/up5k/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-PROJ = example
-PIN_DEF = up5k.pcf
-DEVICE = up5k
-# Relative paths for easier development without messing with installed version
-ARACHNE = ../../../arachne-pnr/bin/arachne-pnr
-ARACHNE_ARGS = -c ../../icebox/chipdb-5k.txt
-ICEPACK = ../../icepack/icepack
-ICETIME = ../../icetime/icetime
-ICEPROG = ../../iceprog/iceprog
-
-all: $(PROJ).bin
-
-%.blif: %.v
-	yosys -p 'synth_ice40 -top top -blif $@' $<
-
-%.asc: $(PIN_DEF) %.blif
-	$(ARACHNE) $(ARACHNE_ARGS) -d $(subst up,,$(subst hx,,$(subst lp,,$(DEVICE)))) -o $@ -p $^
-
-%.bin: %.asc
-	$(ICEPACK) $< $@
-
-%.rpt: %.asc
-	$(ICETIME) -d $(DEVICE) -mtr $@ $<
-
-prog: $(PROJ).bin
-	$(ICEPROG) -S $<
-
-sudo-prog: $(PROJ).bin
-	@echo 'Executing prog as root!!!'
-	sudo $(ICEPROG) -S $<
-
-clean:
-	rm -f $(PROJ).blif $(PROJ).asc $(PROJ).rpt $(PROJ).bin
-
-.SECONDARY:
-.PHONY: all prog clean
diff --git a/examples/up5k/example.v b/examples/up5k/example.v
deleted file mode 100644
index 01b76b8..0000000
--- a/examples/up5k/example.v
+++ /dev/null
@@ -1,10 +0,0 @@
-module top (
-	input  btn,
-	output LED0,
-	output LED1,
-);
-
-assign LED0 = !btn;
-assign LED1 = btn;
-
-endmodule
diff --git a/examples/up5k/up5k.pcf b/examples/up5k/up5k.pcf
deleted file mode 100644
index b1d1263..0000000
--- a/examples/up5k/up5k.pcf
+++ /dev/null
@@ -1,3 +0,0 @@
-set_io LED0 12
-set_io LED1 21
-set_io btn 26
diff --git a/examples/up5k_mac16/Makefile b/examples/up5k_mac16/Makefile
new file mode 100644
index 0000000..06c9ed7
--- /dev/null
+++ b/examples/up5k_mac16/Makefile
@@ -0,0 +1,36 @@
+PROJ = mac16
+PIN_DEF = mac16.pcf
+DEVICE = up5k
+
+ARACHNE = arachne-pnr 
+ARACHNE_ARGS = 
+ICEPACK = icepack
+ICETIME = icetime
+ICEPROG = iceprog
+
+all: $(PROJ).bin
+
+%.blif: %.v
+	yosys -p 'synth_ice40 -top top -blif $@' $<
+
+%.asc: $(PIN_DEF) %.blif
+	$(ARACHNE) $(ARACHNE_ARGS) -d $(subst up,,$(subst hx,,$(subst lp,,$(DEVICE)))) -o $@ -p $^
+
+%.bin: %.asc
+	$(ICEPACK) $< $@
+
+%.rpt: %.asc
+	$(ICETIME) -d $(DEVICE) -mtr $@ $<
+
+prog: $(PROJ).bin
+	$(ICEPROG) -S $<
+
+sudo-prog: $(PROJ).bin
+	@echo 'Executing prog as root!!!'
+	sudo $(ICEPROG) -S $<
+
+clean:
+	rm -f $(PROJ).blif $(PROJ).asc $(PROJ).rpt $(PROJ).bin
+
+.SECONDARY:
+.PHONY: all prog clean
diff --git a/examples/up5k_rgb/Makefile b/examples/up5k_rgb/Makefile
index 711ce5a..51c1f72 100644
--- a/examples/up5k_rgb/Makefile
+++ b/examples/up5k_rgb/Makefile
@@ -1,12 +1,12 @@
 PROJ = rgb
 PIN_DEF = rgb.pcf
 DEVICE = up5k
-# Relative paths for easier development without messing with installed version
-ARACHNE = ../../../arachne-pnr/bin/arachne-pnr 
-ARACHNE_ARGS = -c ../../icebox/chipdb-5k.txt 
-ICEPACK = ../../icepack/icepack
-ICETIME = ../../icetime/icetime
-ICEPROG = ../../iceprog/iceprog
+
+ARACHNE = arachne-pnr 
+ARACHNE_ARGS = 
+ICEPACK = icepack
+ICETIME = icetime
+ICEPROG = iceprog
 
 all: $(PROJ).bin
 
diff --git a/examples/up5k_rgb/rgb.v b/examples/up5k_rgb/rgb.v
index 81920cb..fa29fba 100644
--- a/examples/up5k_rgb/rgb.v
+++ b/examples/up5k_rgb/rgb.v
@@ -10,7 +10,7 @@ SB_HFOSC inthosc (
   .CLKHF(clk)
 );
 
-localparam  counter_width = 30;
+localparam  counter_width = 32;
 
 reg [counter_width-1:0] ctr;
 
@@ -73,9 +73,9 @@ SB_RGBA_DRV RGBA_DRIVER (
 
 
 defparam RGBA_DRIVER.CURRENT_MODE = "0b1";
-defparam RGBA_DRIVER.RGB0_CURRENT = "0b000001";
-defparam RGBA_DRIVER.RGB1_CURRENT = "0b000011";
-defparam RGBA_DRIVER.RGB2_CURRENT = "0b000011";
+defparam RGBA_DRIVER.RGB0_CURRENT = "0b000111";
+defparam RGBA_DRIVER.RGB1_CURRENT = "0b000111";
+defparam RGBA_DRIVER.RGB2_CURRENT = "0b000111";
 
 
 endmodule
-- 
cgit v1.2.3