From a9fd17be6af93062b130624211182d732cfcae8c Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Fri, 23 Jun 2023 12:22:51 +0100
Subject: [PATCH] Added SLDMA230 waiver to make lint
---
makefile | 2 +-
system/nanosoc_subsystems/dma/verilog/nanosoc_ss_dma.v | 2 +-
system/slcorem0_tech | 2 +-
system/sldma230_tech | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/makefile b/makefile
index 1e61682..2f099f1 100644
--- a/makefile
+++ b/makefile
@@ -128,7 +128,7 @@ XMSIM_OPTIONS = -unbuffered -status -LICQUEUE -f xmsim.args -cdslib cds.lib -hd
XM_VC_OPTIONS = -f $(TBENCH_VC) $(ACCELERATOR_VC) $(ADP_OPTIONS)
HAL_BLACK_BOX = -design_info $(LINT_INFO_DIR)/nanosoc_ip.bb -design_info $(LINT_INFO_DIR)/corstone101_ip.bb -design_info $(LINT_INFO_SLCOREM0_DIR)/cortexm0_ip.bb -design_info $(LINT_INFO_SLDMA230_DIR)/pl230_ip.bb
-HAL_WAIVE = -design_info $(LINT_INFO_DIR)/nanosoc_ip.waive
+HAL_WAIVE = -design_info $(LINT_INFO_DIR)/nanosoc_ip.waive -design_info $(LINT_INFO_SLCOREM0_DIR)/slcorem0_ip.waive -design_info $(LINT_INFO_SLDMA230_DIR)/sldma230_ip.waive
# Debug Tester image
DEBUGTESTER = debugtester
diff --git a/system/nanosoc_subsystems/dma/verilog/nanosoc_ss_dma.v b/system/nanosoc_subsystems/dma/verilog/nanosoc_ss_dma.v
index e2af9bf..ae3e12e 100644
--- a/system/nanosoc_subsystems/dma/verilog/nanosoc_ss_dma.v
+++ b/system/nanosoc_subsystems/dma/verilog/nanosoc_ss_dma.v
@@ -78,7 +78,7 @@ module nanosoc_ss_dma #(
// -------------------------------
// DMA Controller 0 Instantiation
// -------------------------------
- sldmac230 #(
+ sldma230 #(
.SYS_ADDR_W (SYS_ADDR_W),
.SYS_DATA_W (SYS_DATA_W),
.CFG_ADDR_W (DMAC_0_CFG_ADDR_W),
diff --git a/system/slcorem0_tech b/system/slcorem0_tech
index d8d9c80..ea38600 160000
--- a/system/slcorem0_tech
+++ b/system/slcorem0_tech
@@ -1 +1 @@
-Subproject commit d8d9c80f3bc2307ff8b71d2b32b6b14bb864c7cc
+Subproject commit ea3860028b182b752e7c4f349745267178c17e50
diff --git a/system/sldma230_tech b/system/sldma230_tech
index d6aef84..83e4d91 160000
--- a/system/sldma230_tech
+++ b/system/sldma230_tech
@@ -1 +1 @@
-Subproject commit d6aef842cb3923fbab31d7b4174e9e15e877a15e
+Subproject commit 83e4d9117a2e770edecb320113806e7aa0a5a19f
--
GitLab