Merge branch 'miscbels'
diff --git a/examples/tinyfpga_rev2/Makefile b/examples/tinyfpga_rev2/Makefile index 2cb40b4..0ff72dd 100644 --- a/examples/tinyfpga_rev2/Makefile +++ b/examples/tinyfpga_rev2/Makefile
@@ -3,10 +3,10 @@ all: ${PROJ}.bit %.json: %.v - yosys -p "synth_ecp5 -noccu2 -nomux -nodram -json $@" $< + yosys -p "synth_ecp5 -json $@" $< %_out.config: %.json - nextpnr-ecp5 --json $< --basecfg ../../misc/basecfgs/empty_lfe5um5g-85f.config --textcfg $@ --85k --package CSFBGA285 --seed 4 + nextpnr-ecp5 --json $< --basecfg ../../misc/basecfgs/empty_lfe5um5g-85f.config --textcfg $@ --um5g-85k --package CSFBGA285 --lpf morse.lpf %.bit: %_out.config ecppack $< $@
diff --git a/examples/tinyfpga_rev2/morse.lpf b/examples/tinyfpga_rev2/morse.lpf new file mode 100644 index 0000000..cf46e13 --- /dev/null +++ b/examples/tinyfpga_rev2/morse.lpf
@@ -0,0 +1,5 @@ +LOCATE COMP "clk" SITE "B17"; +LOCATE COMP "led" SITE "A7"; + +IOBUF PORT "clk" IO_TYPE=LVCMOS33; +IOBUF PORT "led" IO_TYPE=LVCMOS33;
diff --git a/examples/tinyfpga_rev2/morse.v b/examples/tinyfpga_rev2/morse.v index b35385a..386e66f 100644 --- a/examples/tinyfpga_rev2/morse.v +++ b/examples/tinyfpga_rev2/morse.v
@@ -1,12 +1,5 @@ -module top(input clk_pin, output led_pin); +module top(input clk, output led); - wire clk, led; - - (* LOC="B17" *) (* IO_TYPE="LVCMOS33" *) - TRELLIS_IO #(.DIR("INPUT")) clk_buf (.B(clk_pin), .O(clk)); - - (* LOC="A7" *) (* IO_TYPE="LVCMOS33" *) - TRELLIS_IO #(.DIR("OUTPUT")) led_buf_0 (.B(led_pin), .I(led)); // HELLO // .... . .-.. .-.. --- // 10101 000 1 000 101110101 000 101110101 000 11101110111 00000000
diff --git a/libtrellis/CMakeLists.txt b/libtrellis/CMakeLists.txt index 7f00324..4f3edb9 100644 --- a/libtrellis/CMakeLists.txt +++ b/libtrellis/CMakeLists.txt
@@ -145,4 +145,6 @@ install(DIRECTORY ../misc DESTINATION share/trellis) install(DIRECTORY ../util/common DESTINATION share/trellis/util) install(DIRECTORY ../timing/util DESTINATION share/trellis/timing) -install(TARGETS pytrellis DESTINATION share/trellis/libtrellis) +if (BUILD_SHARED) + install(TARGETS pytrellis DESTINATION share/trellis/libtrellis) +endif()