Merge "build: add i2s driver for nexus & shodan"
diff --git a/cantrip_tests.mk b/cantrip_tests.mk
index bc7bb0b..6d6a810 100644
--- a/cantrip_tests.mk
+++ b/cantrip_tests.mk
@@ -22,6 +22,7 @@
 #   cargo_test_cantrip_proc_interface; they need to be rewritten (or tossed)
 CARGO_TEST_CANTRIP=\
   cargo_test_cantrip_os_common_slot_allocator \
+  cargo_test_i2s_driver \
   cargo_test_mailbox_driver \
   cargo_test_opentitan_timer \
   cargo_test_uart_driver \
@@ -52,6 +53,10 @@
 cargo_test_debugconsole_zmodem: | cantrip-gen-headers
 	cd $(CANTRIP_COMPONENTS)/DebugConsole/zmodem && $(CARGO_TEST)
 
+## Runs cargo unit tests for the I2SDriver
+cargo_test_i2s_driver: | cantrip-gen-headers
+	cd $(CANTRIP_COMPONENTS)/SDKRuntime/tests && $(CARGO_TEST)
+
 ## Runs cargo unit tests for the MailboxDriver
 cargo_test_mailbox_driver: | cantrip-gen-headers
 	cd $(CANTRIP_COMPONENTS)/SecurityCoordinator/tests && $(CARGO_TEST)
diff --git a/platforms/nexus/setup.sh b/platforms/nexus/setup.sh
index 151aac6..c6275e5 100644
--- a/platforms/nexus/setup.sh
+++ b/platforms/nexus/setup.sh
@@ -36,6 +36,7 @@
 # regtool.py.
 export REGTOOL="${OPENTITAN_SOURCE}/util/regtool.py"
 # The following files are the input to regtool.py
+export I2S_HJSON="${ROOTDIR}/hw/matcha/hw/top_matcha/ip/i2s/data/i2s.hjson"
 export MBOX_HJSON="${ROOTDIR}/hw/matcha/hw/top_matcha/ip/tlul_mailbox/data/tlul_mailbox.hjson"
 export ML_TOP_HJSON="${ROOTDIR}/hw/matcha/hw/top_matcha/ip/ml_top/data/ml_top.hjson"
 export TIMER_HJSON="${OPENTITAN_GEN_DIR}/rv_timer.hjson"
diff --git a/platforms/shodan/setup.sh b/platforms/shodan/setup.sh
index 9e2ebe9..1aa0c0d 100644
--- a/platforms/shodan/setup.sh
+++ b/platforms/shodan/setup.sh
@@ -36,6 +36,7 @@
 # regtool.py.
 export REGTOOL="${OPENTITAN_SOURCE}/util/regtool.py"
 # The following files are the input to regtool.py
+export I2S_HJSON="${ROOTDIR}/hw/matcha/hw/top_matcha/ip/i2s/data/i2s.hjson"
 export MBOX_HJSON="${ROOTDIR}/hw/matcha/hw/top_matcha/ip/tlul_mailbox/data/tlul_mailbox.hjson"
 export ML_TOP_HJSON="${ROOTDIR}/hw/matcha/hw/top_matcha/ip/ml_top/data/ml_top.hjson"
 export TIMER_HJSON="${OPENTITAN_GEN_DIR}/rv_timer.hjson"