From 3a412c156b6bcc9c970a1cca23dd2c61c95256e5 Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Thu, 29 Jun 2023 20:48:02 +0100
Subject: [PATCH] Updated lint flow and updated vsim flow
---
hal/corstone101_ip.bb | 4 ++++
makefile | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hal/corstone101_ip.bb b/hal/corstone101_ip.bb
index 26a8fb5..ec3321f 100644
--- a/hal/corstone101_ip.bb
+++ b/hal/corstone101_ip.bb
@@ -62,6 +62,10 @@ bb_list
designunit = cmsdk_apb_slave_mux;
file = $ARM_IP_LIBRARY_PATH/latest/Corstone-101/logical/cmsdk_apb_slave_mux/verilog/cmsdk_apb_slave_mux.v;
+ // Exclude CMSDK FPGA ROM
+ designunit = cmsdk_fpga_rom;
+ file = $ARM_IP_LIBRARY_PATH/latest/Corstone-101/logical/models/memories/cmsdk_fpga_rom.v;
+
// Exclude APB Test slave as Arm IP
designunit = cmsdk_apb_test_slave;
file = $ARM_IP_LIBRARY_PATH/latest/Corstone-101/logical/cmsdk_apb_subsystem/verilog/cmsdk_apb_test_slave.v;
diff --git a/makefile b/makefile
index 5033f6b..c8fa1c4 100644
--- a/makefile
+++ b/makefile
@@ -123,8 +123,8 @@ LINT_INFO_SOCDEBUG_DIR = $(SOCLABS_SOCDEBUG_TECH_DIR)/hal
LINT_TOP = nanosoc_chip_pads
# MTI option
-#DF#MTI_OPTIONS = -novopt
-MTI_OPTIONS = -suppress 2892
+MTI_OPTIONS = +acc
+MTI_OPTIONS += -suppress 2892
MTI_VC_OPTIONS = -f $(TBENCH_VC) $(ACCELERATOR_VC) $(ADP_OPTIONS)
# VCS option
@@ -211,7 +211,7 @@ compile_xm : bootrom
lint_xm: bootrom
@rm -rf $(LINT_DIR)
@mkdir -p $(LINT_DIR)
- cd $(LINT_DIR); hal -f $(DESIGN_VC) $(DEFINES_VC) +debug -XMVERILOGARGS "-timescale 1ps/1ps" -top $(LINT_TOP) $(HAL_BLACK_BOX) $(HAL_WAIVE) $(LINT_NOCHECK)
+ cd $(LINT_DIR); xrun -hal -f $(DESIGN_VC) $(DEFINES_VC) +debug "-timescale 1ps/1ps" -top $(LINT_TOP) $(HAL_BLACK_BOX) $(HAL_WAIVE) $(LINT_NOCHECK)
# Note : If coverage is required, you can add -coverage all to xmelab
@@ -278,7 +278,7 @@ run_mti : code compile_mti
# Run simulation in interactive mode
sim_mti : code compile_mti
- vsim $(MTI_OPTIONS) -gui $(TB_TOP) &
+ cd $(SIM_DIR); vsim $(MTI_OPTIONS) -gui $(TB_TOP) &
# Create work directory
lib_mti :
--
GitLab