Merge pull request #38 from PedroAntunes178/main

VexRiscv.v: use AXI interface, use CLINT and PLIC generated in VexRiscv.
IObundle · Oct 18, 2023 · a903278 · a903278
2 parents d4b2152 + c5eee03
commit a903278
Show file tree

Hide file tree

Showing 10 changed files with 4,257 additions and 1,436 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,6 +34,6 @@ jobs:
         with:
           submodules: 'recursive'
       - name: test-clean
-        run: make clean-all
+        run: nix-shell --run "make clean-vexriscv"
       - name: test-vexriscv
         run: nix-shell --run "make vexriscv"
diff --git a/Makefile b/Makefile
@@ -7,19 +7,18 @@ VEX_SUBMODULES_DIR:=$(VEXRISCV_DIR)/submodules
 # Rules
 .PHONY: vexriscv clean-all qemu
 
-CPU ?= LinuxGen
-#CPU ?= GenFullNoMmuNoCache
+CPU ?= VexRiscvAxi4LinuxPlicClint
 
 # Primary targets
 vexriscv:
 	cp $(VEX_HARDWARE_DIR)/vexriscv_core/* $(VEX_SUBMODULES_DIR)/VexRiscv/src/main/scala/vexriscv/demo/ && \
 		cd submodules/VexRiscv && sbt "runMain vexriscv.demo.$(CPU)" && \
-		cp VexRiscv.v $(VEXRISCV_SRC_DIR)
+		cp $(CPU).v $(VEXRISCV_SRC_DIR)
 
 #
 # Clean
 #
 clean-vexriscv:
-	rm $(VEXRISCV_SRC_DIR)/VexRiscv.v
+	rm $(VEXRISCV_SRC_DIR)/$(CPU).v
 
 clean-all: clean-vexriscv
diff --git a/hardware/src/VexRiscv.v_toplevel_RegFilePlugin_regFile.bin b/hardware/src/VexRiscv.v_toplevel_RegFilePlugin_regFile.bin
diff --git a/hardware/src/VexRiscv.v → hardware/src/VexRiscvAxi4LinuxPlicClint.v b/hardware/src/VexRiscv.v → hardware/src/VexRiscvAxi4LinuxPlicClint.v