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.

Sign up for GitHub

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

Jump to bottom

Extend backreferencing #323

Merged
merged 2 commits into from
Jul 17, 2024
Merged

Extend backreferencing #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb894ca
Expose cheshire FPGA flash target to Ara
moimfeld Jul 14, 2024
769c95e
Add device tree patch for cheshire
moimfeld Jul 14, 2024
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
11 changes: 10 additions & 1 deletion cheshire/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ ARA_ROOT := $(MAKEFILE_DIR)/..
BACKREF_CHS_ROOT ?= $(realpath ../../../../..)
BACKREF_CHS_XIL_SCRIPTS := $(BACKREF_CHS_ROOT)/target/xilinx/scripts

# Tools
VIVADO ?= 'vitis-2020.2 vivado'

# Set up Bender targets and defines
# default configuration for Cheshire + Ara is 2_lanes
Expand All @@ -20,11 +22,18 @@ include $(ARA_ROOT)/config/$(ARA_CONFIGURATION).mk
BOARD := vcu128
CUSTOM_BENDER_TARGETS := -t fpga -t cv64a6_imafdcv_sv39 -t cva6 -t $(BOARD) --define ARA --define NR_LANES=$(nr_lanes) --define VLEN=$(vlen)

.PHONY: ara-chs-xilinx-$(BOARD) update_xilinx_src clean
.PHONY: ara-chs-xilinx-$(BOARD) ara-chs-flash-$(BOARD) apply-patches update_xilinx_src clean

ara-chs-xilinx-$(BOARD): update_xilinx_src
make -C $(BACKREF_CHS_ROOT) chs-xilinx-$(BOARD)

ara-chs-flash-$(BOARD):
make -C $(BACKREF_CHS_ROOT) chs-xilinx-flash-$(BOARD) VIVADO=$(VIVADO)

apply-patches:
cd $(BACKREF_CHS_ROOT) && \
git apply $(ARA_ROOT)/cheshire/patches/device_tree.patch

update_xilinx_src:
cd $(BACKREF_CHS_ROOT) && \
bender script vivado $(CUSTOM_BENDER_TARGETS) > $(BACKREF_CHS_XIL_SCRIPTS)/add_sources.vcu128.tcl
Expand Down
13 changes: 13 additions & 0 deletions cheshire/patches/device_tree.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/sw/boot/cheshire.dtsi b/sw/boot/cheshire.dtsi
index 76decc8..5561e87 100644
--- a/sw/boot/cheshire.dtsi
+++ b/sw/boot/cheshire.dtsi
@@ -30,7 +30,7 @@
status = "okay";
compatible = "eth,ariane", "riscv";
clock-frequency = <50000000>; // 50 MHz
- riscv,isa = "rv64imafdc";
+ riscv,isa = "rv64imafdcv";
mmu-type = "riscv,sv39";
tlb-split;
reg = <0>;
Loading