From 3bf32d553267f54771c2af6b7757f1d6abcd5d56 Mon Sep 17 00:00:00 2001 From: Joshua Fife Date: Sat, 23 Oct 2021 17:40:31 -0600 Subject: [PATCH] All part 1 designs Signed-off-by: Joshua Fife --- .github/scripts/build-examples.sh | 9 +++++++++ .github/scripts/generate_job_matrix.py | 5 ++++- projf-makefiles/hello/hello-arty/B/Makefile | 8 ++++++++ projf-makefiles/hello/hello-arty/B/README.rst | 16 ++++++++++++++++ projf-makefiles/hello/hello-arty/C/Makefile | 8 ++++++++ projf-makefiles/hello/hello-arty/C/README.rst | 17 +++++++++++++++++ projf-makefiles/hello/hello-arty/D/Makefile | 8 ++++++++ projf-makefiles/hello/hello-arty/D/README.rst | 16 ++++++++++++++++ 8 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 projf-makefiles/hello/hello-arty/B/Makefile create mode 100644 projf-makefiles/hello/hello-arty/B/README.rst create mode 100644 projf-makefiles/hello/hello-arty/C/Makefile create mode 100644 projf-makefiles/hello/hello-arty/C/README.rst create mode 100644 projf-makefiles/hello/hello-arty/D/Makefile create mode 100644 projf-makefiles/hello/hello-arty/D/README.rst diff --git a/.github/scripts/build-examples.sh b/.github/scripts/build-examples.sh index 42ceb8a..c11b173 100755 --- a/.github/scripts/build-examples.sh +++ b/.github/scripts/build-examples.sh @@ -90,6 +90,15 @@ if [ "$fpga_family" = "xc7" ]; then "hello-a") snippets="${activate_env} projf-makefiles/hello/hello-arty/A/README.rst:hello-arty-a" ;; + "hello-b") + snippets="${activate_env} projf-makefiles/hello/hello-arty/B/README.rst:hello-arty-B" + ;; + "hello-c") + snippets="${activate_env} projf-makefiles/hello/hello-arty/C/README.rst:hello-arty-C" + ;; + "hello-d") + snippets="${activate_env} projf-makefiles/hello/hello-arty/D/README.rst:hello-arty-D" + ;; *) echo "ERROR: Unknown example name: $example" >&2 exit 1 diff --git a/.github/scripts/generate_job_matrix.py b/.github/scripts/generate_job_matrix.py index a610921..6f1f4f3 100755 --- a/.github/scripts/generate_job_matrix.py +++ b/.github/scripts/generate_job_matrix.py @@ -8,7 +8,10 @@ examples = [ "button_controller", "pulse_width_led", "timer", - "hello-a" + "hello-a", + "hello-b", + "hello-c", + "hello-d" ] jobs = [] diff --git a/projf-makefiles/hello/hello-arty/B/Makefile b/projf-makefiles/hello/hello-arty/B/Makefile new file mode 100644 index 0000000..b705668 --- /dev/null +++ b/projf-makefiles/hello/hello-arty/B/Makefile @@ -0,0 +1,8 @@ +current_dir := ${CURDIR} +proj_f_dir := ${current_dir}/../../../../third_party/projf-explore/hello/hello-arty/B + +TOP := top +SOURCES := ${proj_f_dir}/top.sv +XDC := ${proj_f_dir}/arty.xdc + +include ${current_dir}/../../../../common/Makefile diff --git a/projf-makefiles/hello/hello-arty/B/README.rst b/projf-makefiles/hello/hello-arty/B/README.rst new file mode 100644 index 0000000..631b155 --- /dev/null +++ b/projf-makefiles/hello/hello-arty/B/README.rst @@ -0,0 +1,16 @@ +Part 1 Design B +=============== + +This design allows you to turn four LEDs on and off with switches 0 and 1. Control LEDs 0 and 1 with switch 0 and LEDs +2 and 3 with switch 1. To build this design run the following in the root symbiflow-example directory: + +.. code:: bash + :name: hello-arty-B + + TARGET="arty_35" make -C projf-makefiles/hello/hello-arty/B" + +You can then download the bitstream by running: + +.. code:: bash + + TARGET="arty_35" make download -C projf-makefiles/hello/hello-arty/B" diff --git a/projf-makefiles/hello/hello-arty/C/Makefile b/projf-makefiles/hello/hello-arty/C/Makefile new file mode 100644 index 0000000..eec3723 --- /dev/null +++ b/projf-makefiles/hello/hello-arty/C/Makefile @@ -0,0 +1,8 @@ +current_dir := ${CURDIR} +proj_f_dir := ${current_dir}/../../../../third_party/projf-explore/hello/hello-arty/C + +TOP := top +SOURCES := ${proj_f_dir}/top.sv +XDC := ${proj_f_dir}/arty.xdc + +include ${current_dir}/../../../../common/Makefile diff --git a/projf-makefiles/hello/hello-arty/C/README.rst b/projf-makefiles/hello/hello-arty/C/README.rst new file mode 100644 index 0000000..104d1c1 --- /dev/null +++ b/projf-makefiles/hello/hello-arty/C/README.rst @@ -0,0 +1,17 @@ +Part 1 Design C +=============== + +This design has the same functionality in hardware as part C but demonstrates +the use of conditional operators in System Verilog. To build this design run the +following command in the main symbiflow directory: + +.. code:: bash + :name: hello-arty-C + + TARGET="arty_35" make -C projf-makefiles/hello/hello-arty/C" + +You can then download the bitstream by running: + +.. code:: bash + + TARGET="arty_35" make download -C projf-makefiles/hello/hello-arty/C" diff --git a/projf-makefiles/hello/hello-arty/D/Makefile b/projf-makefiles/hello/hello-arty/D/Makefile new file mode 100644 index 0000000..c28491e --- /dev/null +++ b/projf-makefiles/hello/hello-arty/D/Makefile @@ -0,0 +1,8 @@ +current_dir := ${CURDIR} +proj_f_dir := ${current_dir}/../../../../third_party/projf-explore/hello/hello-arty/D + +TOP := top +SOURCES := ${proj_f_dir}/top.sv +XDC := ${proj_f_dir}/arty.xdc + +include ${current_dir}/../../../../common/Makefile diff --git a/projf-makefiles/hello/hello-arty/D/README.rst b/projf-makefiles/hello/hello-arty/D/README.rst new file mode 100644 index 0000000..7014c1c --- /dev/null +++ b/projf-makefiles/hello/hello-arty/D/README.rst @@ -0,0 +1,16 @@ +Part 1 Design D +=============== + +This design is the fourth design from Part 1 of Hello Arty. To build this design run the following +command in the main symbiflow directory: + +.. code:: bash + :name: hello-arty-D + + TARGET="arty_35" make -C projf-makefiles/hello/hello-arty/D" + +You can then download the bitstream by running: + +.. code:: bash + + TARGET="arty_35" make download -C projf-makefiles/hello/hello-arty/D"