diff --git a/makefile b/makefile
index 486da09ae8356d26a634a09e3cfc0774ad49dabe..e6e35907707ad681eefbda64478419c8fd5e8578 100644
--- a/makefile
+++ b/makefile
@@ -112,6 +112,7 @@ LINT_DIR = $(SOCLABS_PROJECT_DIR)/lint/nanosoc
 LINT_INFO_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/hal
 LINT_INFO_SLCOREM0_DIR = $(SOCLABS_SLCOREM0_TECH_DIR)/hal
 LINT_INFO_SLDMA230_DIR = $(SOCLABS_SLDMA230_TECH_DIR)/hal
+LINT_INFO_SOCDEBUG_DIR = $(SOCLABS_SOCDEBUG_TECH_DIR)/hal
 
 LINT_TOP = nanosoc_chip_pads
 
@@ -130,7 +131,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 -design_info $(LINT_INFO_SLCOREM0_DIR)/slcorem0_ip.waive -design_info $(LINT_INFO_SLDMA230_DIR)/sldma230_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 -design_info $(LINT_INFO_SOCDEBUG_DIR)/socdebug_controller_ip.waive
 
 # Debug Tester image
 DEBUGTESTER  = debugtester
diff --git a/system/slcorem0_tech b/system/slcorem0_tech
index ea3860028b182b752e7c4f349745267178c17e50..ddf6ae0e2e3435c8a58ada2fb97ee6c83e16f636 160000
--- a/system/slcorem0_tech
+++ b/system/slcorem0_tech
@@ -1 +1 @@
-Subproject commit ea3860028b182b752e7c4f349745267178c17e50
+Subproject commit ddf6ae0e2e3435c8a58ada2fb97ee6c83e16f636