From ce1c9cc9c5c4fbfff0e0f28b92c6faa86d7c7d14 Mon Sep 17 00:00:00 2001 From: Joanna Brozek Date: Wed, 10 Jun 2020 10:03:21 +0200 Subject: [PATCH] Add counter demo for Arty Signed-off-by: Joanna Brozek --- examples/xc7/counter_test/Makefile | 12 ++++++-- examples/xc7/counter_test/arty.pcf | 12 ++++++++ examples/xc7/counter_test/basys3.pcf | 30 ------------------- .../counter_test/{basys3.sdc => counter.sdc} | 0 examples/xc7/counter_test/counter.v | 5 +--- 5 files changed, 22 insertions(+), 37 deletions(-) create mode 100644 examples/xc7/counter_test/arty.pcf rename examples/xc7/counter_test/{basys3.sdc => counter.sdc} (100%) diff --git a/examples/xc7/counter_test/Makefile b/examples/xc7/counter_test/Makefile index c6b7acf..b1b573c 100644 --- a/examples/xc7/counter_test/Makefile +++ b/examples/xc7/counter_test/Makefile @@ -2,13 +2,19 @@ mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) current_dir := $(patsubst %/,%,$(dir $(mkfile_path))) TOP:=top VERILOG:=${current_dir}/counter.v -PARTNAME:= xc7a35tcpg236-1 DEVICE := xc7a50t_test BITSTREAM_DEVICE := artix7 -PCF:=${current_dir}/basys3.pcf -SDC:=${current_dir}/basys3.sdc +SDC:=${current_dir}/counter.sdc BUILDDIR:=build +ifeq ($(TARGET),arty) + PARTNAME := xc7a35tcsg324-1 + PCF:=${current_dir}/arty.pcf +else + PARTNAME:= xc7a35tcpg236-1 + PCF:=${current_dir}/basys3.pcf +endif + all: ${BUILDDIR}/${TOP}.bit ${BUILDDIR}: diff --git a/examples/xc7/counter_test/arty.pcf b/examples/xc7/counter_test/arty.pcf new file mode 100644 index 0000000..0defbed --- /dev/null +++ b/examples/xc7/counter_test/arty.pcf @@ -0,0 +1,12 @@ +# 100 MHz CLK +set_io clk E3 + +# UART +set_io rx A9 +set_io tx D10 + +# LEDs +set_io led[0] H5 +set_io led[1] J5 +set_io led[2] T9 +set_io led[3] T10 diff --git a/examples/xc7/counter_test/basys3.pcf b/examples/xc7/counter_test/basys3.pcf index cb4191c..3b6fe08 100644 --- a/examples/xc7/counter_test/basys3.pcf +++ b/examples/xc7/counter_test/basys3.pcf @@ -3,39 +3,9 @@ set_io clk W5 set_io tx A18 set_io rx B18 -# -# in[0:15] correspond with SW0-SW15 on the basys3 -set_io sw[0] V17 -set_io sw[1] V16 -set_io sw[2] W16 -set_io sw[3] W17 -set_io sw[4] W15 -set_io sw[5] V15 -set_io sw[6] W14 -set_io sw[7] W13 -set_io sw[8] V2 -set_io sw[9] T3 -set_io sw[10] T2 -set_io sw[11] R3 -set_io sw[12] W2 -set_io sw[13] U1 -set_io sw[14] T1 -set_io sw[15] R2 # out[0:15] correspond with LD0-LD15 on the basys3 set_io led[0] U16 set_io led[1] E19 set_io led[2] U19 set_io led[3] V19 -set_io led[4] W18 -set_io led[5] U15 -set_io led[6] U14 -set_io led[7] V14 -set_io led[8] V13 -set_io led[9] V3 -set_io led[10] W3 -set_io led[11] U3 -set_io led[12] P3 -set_io led[13] N3 -set_io led[14] P1 -set_io led[15] L1 diff --git a/examples/xc7/counter_test/basys3.sdc b/examples/xc7/counter_test/counter.sdc similarity index 100% rename from examples/xc7/counter_test/basys3.sdc rename to examples/xc7/counter_test/counter.sdc diff --git a/examples/xc7/counter_test/counter.v b/examples/xc7/counter_test/counter.v index 642b508..f5248db 100644 --- a/examples/xc7/counter_test/counter.v +++ b/examples/xc7/counter_test/counter.v @@ -2,8 +2,7 @@ module top ( input clk, input rx, output tx, - input [15:0] sw, - output [15:0] led + output [3:0] led ); localparam BITS = 4; @@ -19,7 +18,5 @@ module top ( end assign led[3:0] = counter >> LOG2DELAY; - assign led[14:4] = sw[14:4]; assign tx = rx; - assign led[15] = ^sw; endmodule