Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Could you please help me check my prototype for zcu102? #2109

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
blank_issues_enabled: false
blank_issues_enabled: true
contact_links:
- name: Chipyard Mailing List
url: https://groups.google.com/forum/#!forum/chipyard
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ project/project/
.classpath_cache/
.vscode/
tests/build/
fpga/generated-src/*
3 changes: 2 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[submodule "fpga/fpga-shells"]
path = fpga/fpga-shells
url = https://github.com/chipsalliance/rocket-chip-fpga-shells.git
url = https://github.com/Jerryy959/rocket-chip-fpga-shells.git
branch = zcu102
[submodule "generators/bar-fetchers"]
path = generators/bar-fetchers
url = https://github.com/ucb-bar/bar-fetchers.git
Expand Down
31 changes: 31 additions & 0 deletions HowToUse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
How to use this branch?
=======================

This branch just for zcu102 fpga.

Follow the steps below to use this branch:

```bash
# 1. Install the docker engine on your ubuntu host.
# 2. Docker pull the docker image, which has all the necessary tools and dependencies installed.
docker pull jerryy959/chipyard-zcu:v1.13.0
# 3. Run the docker container with one shared directory for building the vivado project on your host.
docker run -itd -v /workspace:/jerry jeffery959/chipyard-zcu:v1.13.0 /bin/bash
# 4. Create the working directory.
mkdir -p /workspace
# 5. Attach to the running container.
docker attach <container_id>
# 6. Pull the newest code from the chipyard repo in the container.
cd /workspace/chipyard && git checkout . && git remote set-url origin [email protected]:Jerryy959/chipyard.git && git pull origin zcu102
# 7. Build the chipyard project in the container.
cd /workspace/chipyard/fpga && source ../env.sh && make clean && make SUB_PROJECT=zcu102 verilog
# 8. Copy the whole project to the shared directory which is </jerry>.
cp -rf /workspace/chipyard /jerry
# 9. Open a new terminal on your host and rebuild the project, just for test.
cd /workapce/chipyard/fpga && source ../env.sh && make clean && make SUB_PROJECT=zcu102 vivado
# 10. Source the vivado settings64.sh.
source /tools/Xilinx/Vivado/2022.2/settings64.sh
# 11. Rebuild the project to generate the bitstream.
cd /workapce/chipyard/fpga && source ../env.sh && make clean && make SUB_PROJECT=zcu102 bitstream
# 12. Then flash the bitstream to the zcu102 board.
```
1 change: 1 addition & 0 deletions chipyard
8 changes: 8 additions & 0 deletions fpga/.Xil/Vivado-123488-ubuntu-linux-22-04-02-desktop/.lpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Product Version: Vivado v2022.2 (64-bit) -->
<!-- -->
<!-- Copyright 1986-2022 Xilinx, Inc. All Rights Reserved. -->

<labtools version="1" minor="0">
<HWSession Dir="hw_1" File="hw.xml"/>
</labtools>
8 changes: 8 additions & 0 deletions fpga/.Xil/Vivado-1398501-ubuntu-linux-22-04-02-desktop/.lpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Product Version: Vivado v2022.2 (64-bit) -->
<!-- -->
<!-- Copyright 1986-2022 Xilinx, Inc. All Rights Reserved. -->

<labtools version="1" minor="0">
<HWSession Dir="hw_1" File="hw.xml"/>
</labtools>
8 changes: 8 additions & 0 deletions fpga/.Xil/Vivado-78320-ubuntu-linux-22-04-02-desktop/.lpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Product Version: Vivado v2022.2 (64-bit) -->
<!-- -->
<!-- Copyright 1986-2022 Xilinx, Inc. All Rights Reserved. -->

<labtools version="1" minor="0">
<HWSession Dir="hw_1" File="hw.xml"/>
</labtools>
30 changes: 29 additions & 1 deletion fpga/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sim_name := none
#########################################################################################
# include shared variables
#########################################################################################
SUB_PROJECT ?= vcu118
SUB_PROJECT ?= zcu102

ifeq ($(SUB_PROJECT),vc707)
SBT_PROJECT ?= chipyard_fpga
Expand Down Expand Up @@ -87,6 +87,34 @@ ifeq ($(SUB_PROJECT),arty100t)
FPGA_BRAND ?= xilinx
endif

ifeq ($(SUB_PROJECT),zcu102)
SBT_PROJECT ?= chipyard_fpga
MODEL ?= ZCU102FPGATestHarness
VLOG_MODEL ?= ZCU102FPGATestHarness
MODEL_PACKAGE ?= chipyard.fpga.zcu102
CONFIG ?= RocketZCU102Config
CONFIG_PACKAGE ?= chipyard.fpga.zcu102
GENERATOR_PACKAGE ?= chipyard
TB ?= none # unused
TOP ?= ChipTop
BOARD ?= zcu102
FPGA_BRAND ?= xilinx
endif

ifeq ($(SUB_PROJECT),zcu106)
SBT_PROJECT ?= chipyard_fpga
MODEL ?= ZCU106FPGATestHarness
VLOG_MODEL ?= ZCU106FPGATestHarness
MODEL_PACKAGE ?= chipyard.fpga.zcu106
CONFIG ?= RocketZCU106Config
CONFIG_PACKAGE ?= chipyard.fpga.zcu106
GENERATOR_PACKAGE ?= chipyard
TB ?= none # unused
TOP ?= ChipTop
BOARD ?= zcu106
FPGA_BRAND ?= xilinx
endif

export USE_CHISEL6=1

include $(base_dir)/variables.mk
Expand Down
Loading