From 7b623cdfdf052d6eca2ee1ab74f1926751a4bf53 Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Wed, 29 Jul 2020 12:19:34 -0700 Subject: [PATCH] Remove the extra examples directory. Signed-off-by: Tim 'mithro' Ansell --- README.md | 27 +++++++++++------- {examples/eos-s3 => eos-s3}/Makefile | 0 {examples/eos-s3 => eos-s3}/btn_counter.v | 0 {examples/eos-s3 => eos-s3}/chandalar.pcf | 0 {examples/eos-s3 => eos-s3}/environment.yml | 0 {examples/eos-s3 => eos-s3}/quickfeather.pcf | 0 {examples/eos-s3 => eos-s3}/requirements.txt | 0 {examples/xc7 => xc7}/counter_test/Makefile | 0 {examples/xc7 => xc7}/counter_test/arty.pcf | 0 {examples/xc7 => xc7}/counter_test/basys3.pcf | 0 .../xc7 => xc7}/counter_test/counter.sdc | 0 {examples/xc7 => xc7}/counter_test/counter.v | 0 {examples/xc7 => xc7}/environment.yml | 0 .../xc7 => xc7}/linux_litex_demo/Makefile | 0 .../linux_litex_demo/VexRiscv_Linux.v | 0 .../xc7 => xc7}/linux_litex_demo/arty.pcf | 0 .../xc7 => xc7}/linux_litex_demo/arty.sdc | 0 .../xc7 => xc7}/linux_litex_demo/arty.xdc | 0 .../linux_litex_demo/baselitex_arty.v | 0 .../linux_litex_demo/buildroot/Image | Bin .../linux_litex_demo/buildroot/rootfs.cpio | Bin .../linux_litex_demo/buildroot/rv32.dtb | Bin .../linux_litex_demo/emulator/emulator.bin | Bin .../xc7 => xc7}/linux_litex_demo/mem.init | 0 .../xc7 => xc7}/linux_litex_demo/mem_1.init | 0 .../xc7 => xc7}/linux_litex_demo/mem_2.init | 0 {examples/xc7 => xc7}/picosoc_demo/Makefile | 0 {examples/xc7 => xc7}/picosoc_demo/basys3.pcf | 0 {examples/xc7 => xc7}/picosoc_demo/basys3.sdc | 0 .../picosoc_demo/basys3_demo_no_roi.v | 0 {examples/xc7 => xc7}/picosoc_demo/picorv32.v | 0 .../picosoc_demo/picosoc_noflash.v | 0 {examples/xc7 => xc7}/picosoc_demo/progmem.v | 0 .../xc7 => xc7}/picosoc_demo/simpleuart.v | 0 {examples/xc7 => xc7}/requirements.txt | 0 35 files changed, 17 insertions(+), 10 deletions(-) rename {examples/eos-s3 => eos-s3}/Makefile (100%) rename {examples/eos-s3 => eos-s3}/btn_counter.v (100%) rename {examples/eos-s3 => eos-s3}/chandalar.pcf (100%) rename {examples/eos-s3 => eos-s3}/environment.yml (100%) rename {examples/eos-s3 => eos-s3}/quickfeather.pcf (100%) rename {examples/eos-s3 => eos-s3}/requirements.txt (100%) rename {examples/xc7 => xc7}/counter_test/Makefile (100%) rename {examples/xc7 => xc7}/counter_test/arty.pcf (100%) rename {examples/xc7 => xc7}/counter_test/basys3.pcf (100%) rename {examples/xc7 => xc7}/counter_test/counter.sdc (100%) rename {examples/xc7 => xc7}/counter_test/counter.v (100%) rename {examples/xc7 => xc7}/environment.yml (100%) rename {examples/xc7 => xc7}/linux_litex_demo/Makefile (100%) rename {examples/xc7 => xc7}/linux_litex_demo/VexRiscv_Linux.v (100%) rename {examples/xc7 => xc7}/linux_litex_demo/arty.pcf (100%) rename {examples/xc7 => xc7}/linux_litex_demo/arty.sdc (100%) rename {examples/xc7 => xc7}/linux_litex_demo/arty.xdc (100%) rename {examples/xc7 => xc7}/linux_litex_demo/baselitex_arty.v (100%) rename {examples/xc7 => xc7}/linux_litex_demo/buildroot/Image (100%) rename {examples/xc7 => xc7}/linux_litex_demo/buildroot/rootfs.cpio (100%) rename {examples/xc7 => xc7}/linux_litex_demo/buildroot/rv32.dtb (100%) rename {examples/xc7 => xc7}/linux_litex_demo/emulator/emulator.bin (100%) rename {examples/xc7 => xc7}/linux_litex_demo/mem.init (100%) rename {examples/xc7 => xc7}/linux_litex_demo/mem_1.init (100%) rename {examples/xc7 => xc7}/linux_litex_demo/mem_2.init (100%) rename {examples/xc7 => xc7}/picosoc_demo/Makefile (100%) rename {examples/xc7 => xc7}/picosoc_demo/basys3.pcf (100%) rename {examples/xc7 => xc7}/picosoc_demo/basys3.sdc (100%) rename {examples/xc7 => xc7}/picosoc_demo/basys3_demo_no_roi.v (100%) rename {examples/xc7 => xc7}/picosoc_demo/picorv32.v (100%) rename {examples/xc7 => xc7}/picosoc_demo/picosoc_noflash.v (100%) rename {examples/xc7 => xc7}/picosoc_demo/progmem.v (100%) rename {examples/xc7 => xc7}/picosoc_demo/simpleuart.v (100%) rename {examples/xc7 => xc7}/requirements.txt (100%) diff --git a/README.md b/README.md index 2e58b5c..e2b1d5f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,14 @@ The examples target the Xilinx Artix-7 and the QuickLogic EOS S3 devices. The repository includes: -* [examples](./examples) - Example FPGA designs including: +* [eos-s3](./eos-s3) - Example FPGA designs for the QuickLogic EOS S3 series of parts: + + * Verilog code + * Pin constraints files + * Timing constraints files + * Makefiles for running the SymbiFlow toolchain + +* [xc7](./xc7) - Example FPGA designs for the Xilinx 7 series of parts: * Verilog code * Pin constraints files @@ -35,7 +42,7 @@ For the Artix-7 devices: INSTALL_DIR="/opt/symbiflow/xc7" bash conda_installer.sh -b -p $INSTALL_DIR/conda && rm conda_installer.sh source "$INSTALL_DIR/conda/etc/profile.d/conda.sh" -conda env create -f examples/xc7/environment.yml +conda env create -f xc7/environment.yml conda activate xc7 wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/presubmit/install/477/20200714-082108/symbiflow-arch-defs-install-8eb88e76.tar.xz | tar -xJ --one-top-level=$INSTALL_DIR/install conda deactivate @@ -54,8 +61,8 @@ bash Symbiflow_v1.1.0.gz.run With the toolchain installed, you can build the example designs. The example designs are provided in separate directories: -* `examples/xc7` directory for the Artix-7 devices -* `examples/eos-s3` directory for the EOS S3 devices +* `xc7` directory for the Artix-7 devices +* `eos-s3` directory for the EOS S3 devices ### Example designs for the Artix-7 devices: @@ -76,11 +83,11 @@ source "$INSTALL_DIR/conda/etc/profile.d/conda.sh" conda activate xc7 git clone https://github.com/SymbiFlow/symbiflow-examples && cd symbiflow-examples # counter example -pushd examples/xc7/counter_test && TARGET="arty_50" make && popd -pushd examples/xc7/counter_test && TARGET="arty_100" make && popd -pushd examples/xc7/counter_test && make clean && TARGET="basys3" make && popd +pushd xc7/counter_test && TARGET="arty_50" make && popd +pushd xc7/counter_test && TARGET="arty_100" make && popd +pushd xc7/counter_test && make clean && TARGET="basys3" make && popd # picosoc example -pushd examples/xc7/picosoc_demo && make && popd +pushd xc7/picosoc_demo && make && popd # litex example wget https://raw.githubusercontent.com/enjoy-digital/litex/master/litex_setup.py chmod +x litex_setup.py @@ -91,7 +98,7 @@ tar -xf riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz export PATH=$PATH:$PWD/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14/bin/ pushd litex/litex/boards/targets && ./arty.py --toolchain symbiflow --cpu-type vexriscv --build && popd # linux litex example -pushd examples/xc7/linux_litex_demo && make && popd +pushd xc7/linux_litex_demo && make && popd ``` ### Example design for the EOS S3 devices: @@ -107,5 +114,5 @@ source "$INSTALL_DIR/conda/etc/profile.d/conda.sh" conda activate git clone https://github.com/SymbiFlow/symbiflow-examples && cd symbiflow-examples -pushd examples/eos-s3 && make && popd +pushd eos-s3 && make && popd ``` diff --git a/examples/eos-s3/Makefile b/eos-s3/Makefile similarity index 100% rename from examples/eos-s3/Makefile rename to eos-s3/Makefile diff --git a/examples/eos-s3/btn_counter.v b/eos-s3/btn_counter.v similarity index 100% rename from examples/eos-s3/btn_counter.v rename to eos-s3/btn_counter.v diff --git a/examples/eos-s3/chandalar.pcf b/eos-s3/chandalar.pcf similarity index 100% rename from examples/eos-s3/chandalar.pcf rename to eos-s3/chandalar.pcf diff --git a/examples/eos-s3/environment.yml b/eos-s3/environment.yml similarity index 100% rename from examples/eos-s3/environment.yml rename to eos-s3/environment.yml diff --git a/examples/eos-s3/quickfeather.pcf b/eos-s3/quickfeather.pcf similarity index 100% rename from examples/eos-s3/quickfeather.pcf rename to eos-s3/quickfeather.pcf diff --git a/examples/eos-s3/requirements.txt b/eos-s3/requirements.txt similarity index 100% rename from examples/eos-s3/requirements.txt rename to eos-s3/requirements.txt diff --git a/examples/xc7/counter_test/Makefile b/xc7/counter_test/Makefile similarity index 100% rename from examples/xc7/counter_test/Makefile rename to xc7/counter_test/Makefile diff --git a/examples/xc7/counter_test/arty.pcf b/xc7/counter_test/arty.pcf similarity index 100% rename from examples/xc7/counter_test/arty.pcf rename to xc7/counter_test/arty.pcf diff --git a/examples/xc7/counter_test/basys3.pcf b/xc7/counter_test/basys3.pcf similarity index 100% rename from examples/xc7/counter_test/basys3.pcf rename to xc7/counter_test/basys3.pcf diff --git a/examples/xc7/counter_test/counter.sdc b/xc7/counter_test/counter.sdc similarity index 100% rename from examples/xc7/counter_test/counter.sdc rename to xc7/counter_test/counter.sdc diff --git a/examples/xc7/counter_test/counter.v b/xc7/counter_test/counter.v similarity index 100% rename from examples/xc7/counter_test/counter.v rename to xc7/counter_test/counter.v diff --git a/examples/xc7/environment.yml b/xc7/environment.yml similarity index 100% rename from examples/xc7/environment.yml rename to xc7/environment.yml diff --git a/examples/xc7/linux_litex_demo/Makefile b/xc7/linux_litex_demo/Makefile similarity index 100% rename from examples/xc7/linux_litex_demo/Makefile rename to xc7/linux_litex_demo/Makefile diff --git a/examples/xc7/linux_litex_demo/VexRiscv_Linux.v b/xc7/linux_litex_demo/VexRiscv_Linux.v similarity index 100% rename from examples/xc7/linux_litex_demo/VexRiscv_Linux.v rename to xc7/linux_litex_demo/VexRiscv_Linux.v diff --git a/examples/xc7/linux_litex_demo/arty.pcf b/xc7/linux_litex_demo/arty.pcf similarity index 100% rename from examples/xc7/linux_litex_demo/arty.pcf rename to xc7/linux_litex_demo/arty.pcf diff --git a/examples/xc7/linux_litex_demo/arty.sdc b/xc7/linux_litex_demo/arty.sdc similarity index 100% rename from examples/xc7/linux_litex_demo/arty.sdc rename to xc7/linux_litex_demo/arty.sdc diff --git a/examples/xc7/linux_litex_demo/arty.xdc b/xc7/linux_litex_demo/arty.xdc similarity index 100% rename from examples/xc7/linux_litex_demo/arty.xdc rename to xc7/linux_litex_demo/arty.xdc diff --git a/examples/xc7/linux_litex_demo/baselitex_arty.v b/xc7/linux_litex_demo/baselitex_arty.v similarity index 100% rename from examples/xc7/linux_litex_demo/baselitex_arty.v rename to xc7/linux_litex_demo/baselitex_arty.v diff --git a/examples/xc7/linux_litex_demo/buildroot/Image b/xc7/linux_litex_demo/buildroot/Image similarity index 100% rename from examples/xc7/linux_litex_demo/buildroot/Image rename to xc7/linux_litex_demo/buildroot/Image diff --git a/examples/xc7/linux_litex_demo/buildroot/rootfs.cpio b/xc7/linux_litex_demo/buildroot/rootfs.cpio similarity index 100% rename from examples/xc7/linux_litex_demo/buildroot/rootfs.cpio rename to xc7/linux_litex_demo/buildroot/rootfs.cpio diff --git a/examples/xc7/linux_litex_demo/buildroot/rv32.dtb b/xc7/linux_litex_demo/buildroot/rv32.dtb similarity index 100% rename from examples/xc7/linux_litex_demo/buildroot/rv32.dtb rename to xc7/linux_litex_demo/buildroot/rv32.dtb diff --git a/examples/xc7/linux_litex_demo/emulator/emulator.bin b/xc7/linux_litex_demo/emulator/emulator.bin similarity index 100% rename from examples/xc7/linux_litex_demo/emulator/emulator.bin rename to xc7/linux_litex_demo/emulator/emulator.bin diff --git a/examples/xc7/linux_litex_demo/mem.init b/xc7/linux_litex_demo/mem.init similarity index 100% rename from examples/xc7/linux_litex_demo/mem.init rename to xc7/linux_litex_demo/mem.init diff --git a/examples/xc7/linux_litex_demo/mem_1.init b/xc7/linux_litex_demo/mem_1.init similarity index 100% rename from examples/xc7/linux_litex_demo/mem_1.init rename to xc7/linux_litex_demo/mem_1.init diff --git a/examples/xc7/linux_litex_demo/mem_2.init b/xc7/linux_litex_demo/mem_2.init similarity index 100% rename from examples/xc7/linux_litex_demo/mem_2.init rename to xc7/linux_litex_demo/mem_2.init diff --git a/examples/xc7/picosoc_demo/Makefile b/xc7/picosoc_demo/Makefile similarity index 100% rename from examples/xc7/picosoc_demo/Makefile rename to xc7/picosoc_demo/Makefile diff --git a/examples/xc7/picosoc_demo/basys3.pcf b/xc7/picosoc_demo/basys3.pcf similarity index 100% rename from examples/xc7/picosoc_demo/basys3.pcf rename to xc7/picosoc_demo/basys3.pcf diff --git a/examples/xc7/picosoc_demo/basys3.sdc b/xc7/picosoc_demo/basys3.sdc similarity index 100% rename from examples/xc7/picosoc_demo/basys3.sdc rename to xc7/picosoc_demo/basys3.sdc diff --git a/examples/xc7/picosoc_demo/basys3_demo_no_roi.v b/xc7/picosoc_demo/basys3_demo_no_roi.v similarity index 100% rename from examples/xc7/picosoc_demo/basys3_demo_no_roi.v rename to xc7/picosoc_demo/basys3_demo_no_roi.v diff --git a/examples/xc7/picosoc_demo/picorv32.v b/xc7/picosoc_demo/picorv32.v similarity index 100% rename from examples/xc7/picosoc_demo/picorv32.v rename to xc7/picosoc_demo/picorv32.v diff --git a/examples/xc7/picosoc_demo/picosoc_noflash.v b/xc7/picosoc_demo/picosoc_noflash.v similarity index 100% rename from examples/xc7/picosoc_demo/picosoc_noflash.v rename to xc7/picosoc_demo/picosoc_noflash.v diff --git a/examples/xc7/picosoc_demo/progmem.v b/xc7/picosoc_demo/progmem.v similarity index 100% rename from examples/xc7/picosoc_demo/progmem.v rename to xc7/picosoc_demo/progmem.v diff --git a/examples/xc7/picosoc_demo/simpleuart.v b/xc7/picosoc_demo/simpleuart.v similarity index 100% rename from examples/xc7/picosoc_demo/simpleuart.v rename to xc7/picosoc_demo/simpleuart.v diff --git a/examples/xc7/requirements.txt b/xc7/requirements.txt similarity index 100% rename from examples/xc7/requirements.txt rename to xc7/requirements.txt