Skip to content

Commit

Permalink
migrate to 2020.1
Browse files Browse the repository at this point in the history
  • Loading branch information
b1f6c1c4 committed Oct 16, 2020
1 parent 0d334a9 commit 74c2c36
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
VIVADO?=/opt/xilinx/Vivado/2018.2
SDK?=/opt/xilinx/SDK/2018.2
BOOTGEN?=bootgen
VIVADO?=/opt/Xilinx/Vivado/2020.1
VITIS?=/opt/Xilinx/Vitis/2020.1
DESIGN=$(wildcard design/*.v)
CONSTR=$(wildcard constr/*.xdc)
XCI=$(patsubst ip/%.xci,%,$(wildcard ip/*.xci))
FONT?=/usr/share/fonts/TTF/Consolas-Regular.ttf

export VIVADO
export VITIS

PART=xc7z020clg400-1
export PART

Expand Down Expand Up @@ -64,7 +66,7 @@ build/fsbl/fsbl.sdk/fsbl/Release/fsbl.elf: script/fsbl-sdk.tcl build/system.hdf
./script/launch-sdk.sh $<

build/BOOT.bin: script/fsbl.bif build/fsbl/fsbl.sdk/fsbl/Release/fsbl.elf build/output.bit
$(SDK)/bin/bootgen -arch zynq -image $< -w -o build/BOOT.bin
$(VITIS)/bin/bootgen -arch zynq -image $< -w -o build/BOOT.bin

build/overlay/node_modules: script/overlay/package.json script/overlay/package-lock.json
mkdir -p build/overlay/
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ You can follow these steps get *Deep:* Dark-Fantasy running:

**If the default settings don't work for you for some reason, you should try build the project from source code.**

Note: You need Xilinx Vivado (2018.2), `make`, `bash`, `node`, `npm`, and `awk` to generate the bitstream file.
Note: You need Xilinx Vivado (2020.1), `make`, `bash`, `node`, `npm`, and `awk` to generate the bitstream file.
You also need a ttf font for the overlay number display.
Futhermore, you need Xilinx SDK (2018.2), `make`, `bash` to generate the bootable image.
Futhermore, you need Xilinx Vitis (2020.1), `make`, `bash` to generate the bootable image.

### Step 1: Get the source code

Expand Down Expand Up @@ -136,8 +136,8 @@ Multicore won't help.
export FONT=/usr/share/fonts/truetype/noto/NotoMono-Regular.ttf
# Specify your Xilinx Vivado installation
# Specify your Xilinx SDK installation
export VIVODO=/opt/xilinx/Vivado/2018.2
export SDK=/opt/xilinx/SDK/2018.2
export VIVODO=/opt/Xilinx/Vivado/2020.1
export VITIS=/opt/Xilinx/Vitis/2020.1
# Perform synthsizing, implementation, bitstream creation, boot image creation.
# This may take a while (15~25min), so be patient
make -j8
Expand Down
2 changes: 1 addition & 1 deletion script/launch-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ finish() {
}
trap finish EXIT

"$SDK/bin/xsct" "../../../$TCL" 2>&1 | tee "../../$LOG"
"$VITIS/bin/xsct" "../../../$TCL" 2>&1 | tee "../../$LOG"
trap - EXIT

0 comments on commit 74c2c36

Please sign in to comment.