From ff73f798edf00a4a8f9a1e2730d6af51b6c4d021 Mon Sep 17 00:00:00 2001 From: Jacob Pease Date: Thu, 16 Nov 2023 13:59:12 -0600 Subject: [PATCH] Replaced vivado-risc-v addins directory with new SDC repo. --- .gitmodules | 6 +++--- fpga/generator/wally.tcl | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 361441a18..54d9dd970 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,9 +23,9 @@ [submodule "addins/vivado-boards"] path = addins/vivado-boards url = https://github.com/Digilent/vivado-boards/ -[submodule "addins/vivado-risc-v"] - path = addins/vivado-risc-v - url = https://github.com/eugene-tarassov/vivado-risc-v.git +[submodule "addins/ahbsdc"] + path = addins/ahbsdc + url = https://github.com/JacobPease/ahbsdc.git [submodule "addins/riscv-arch-test"] path = addins/riscv-arch-test url = https://github.com/riscv-non-isa/riscv-arch-test diff --git a/fpga/generator/wally.tcl b/fpga/generator/wally.tcl index d699c3d21..bad9981df 100644 --- a/fpga/generator/wally.tcl +++ b/fpga/generator/wally.tcl @@ -42,13 +42,9 @@ if {$board=="ArtyA7"} { # read in all other rtl read_verilog -sv [glob -type f ../src/CopiedFiles_do_not_add_to_repo/*/*.sv ../src/CopiedFiles_do_not_add_to_repo/*/*/*.sv] # *** Once the sdc is updated to use ahb changes these to system verilog. -read_verilog [glob -type f ../src/axi_sdc_controller.v] -read_verilog [glob -type f ../../addins/vivado-risc-v/sdc/sd_cmd_master.v] -read_verilog [glob -type f ../../addins/vivado-risc-v/sdc/sd_cmd_serial_host.v] -read_verilog [glob -type f ../../addins/vivado-risc-v/sdc/sd_data_master.v] -read_verilog [glob -type f ../../addins/vivado-risc-v/sdc/sd_data_serial_host.v] +read_verilog [glob -type f ../../addins/ahbsdc/sdc/*.v] -set_property include_dirs {../src/CopiedFiles_do_not_add_to_repo/config ../../config/shared ../../addins/vivado-risc-v/sdc} [current_fileset] +set_property include_dirs {../src/CopiedFiles_do_not_add_to_repo/config ../../config/shared ../../addins/ahbsdc/sdc} [current_fileset] if {$board=="ArtyA7"} { add_files -fileset constrs_1 -norecurse ../constraints/constraints-$board.xdc