From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 27 Oct 2013 07:21:56 +0000 (+0100)
Subject: Xilinx mojo_counter example is now working
X-Git-Tag: yosys-0.2.0~441
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=02f321b6fcd17c94ad633d1070c03cbec1eb86e8;p=yosys.git

Xilinx mojo_counter example is now working
---

diff --git a/techlibs/xilinx/example_mojo_counter/example.sh b/techlibs/xilinx/example_mojo_counter/example.sh
index 87af0ea31..466fadade 100644
--- a/techlibs/xilinx/example_mojo_counter/example.sh
+++ b/techlibs/xilinx/example_mojo_counter/example.sh
@@ -19,8 +19,12 @@ abc -lut 6; opt
 # map internal cells to FPGA cells
 techmap -map ../cells.v; opt
 
+# insert clock buffers
+select -set clocks */t:FDRE %x:+FDRE[C] */t:FDRE %d
+iopadmap -inpad BUFGP O:I @clocks
+
 # insert i/o buffers
-iopadmap -outpad OBUF I:O -inpad BUFGP O:I
+iopadmap -outpad OBUF I:O -inpad IBUF O:I @clocks %n
 
 # write netlist
 write_edif synth.edif
diff --git a/techlibs/xilinx/example_mojo_counter/example.ucf b/techlibs/xilinx/example_mojo_counter/example.ucf
index 591cbe76f..93d97b4dc 100644
--- a/techlibs/xilinx/example_mojo_counter/example.ucf
+++ b/techlibs/xilinx/example_mojo_counter/example.ucf
@@ -2,6 +2,7 @@ NET "clk" TNM_NET = clk;
 TIMESPEC TS_clk = PERIOD "clk" 50 MHz HIGH 50%;
 
 NET "clk" LOC = P56;
+NET "ctrl" LOC = P1;
 
 NET "led_0" LOC = P134;
 NET "led_1" LOC = P133;
diff --git a/techlibs/xilinx/example_mojo_counter/example.v b/techlibs/xilinx/example_mojo_counter/example.v
index 8e79942e2..cb98cc1b2 100644
--- a/techlibs/xilinx/example_mojo_counter/example.v
+++ b/techlibs/xilinx/example_mojo_counter/example.v
@@ -1,13 +1,13 @@
-module top(clk, led_7, led_6, led_5, led_4, led_3, led_2, led_1, led_0);
+module top(clk, ctrl, led_7, led_6, led_5, led_4, led_3, led_2, led_1, led_0);
 
-input clk;
+input clk, ctrl;
 output led_7, led_6, led_5, led_4;
 output led_3, led_2, led_1, led_0;
 
 reg [31:0] counter;
 
 always @(posedge clk)
-	counter <= 32'b_1010_1010_1010_1010_1010_1010_1010_1010; // counter + 1;
+	counter <= counter + (ctrl ? 4 : 1);
 
 assign {led_7, led_6, led_5, led_4, led_3, led_2, led_1, led_0} = counter >> 24;