Use IP hjson moved to matcha/hw/ip

Change-Id: Iff05949985e84140fc5d3a18a3e5905374f72e09
diff --git a/platforms/nexus/setup.sh b/platforms/nexus/setup.sh
index d23a6cf..c1a2caa 100644
--- a/platforms/nexus/setup.sh
+++ b/platforms/nexus/setup.sh
@@ -36,9 +36,9 @@
 # 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 I2S_HJSON="${ROOTDIR}/hw/matcha/hw/ip/i2s/data/i2s.hjson"
+export MBOX_HJSON="${ROOTDIR}/hw/matcha/hw/ip/tlul_mailbox/data/tlul_mailbox.hjson"
+export ML_TOP_HJSON="${ROOTDIR}/hw/matcha/hw/ip/ml_top/data/ml_top.hjson"
 export TIMER_HJSON="${OPENTITAN_GEN_DIR}/rv_timer.hjson"
 export UART_HJSON="${OPENTITAN_SOURCE}/hw/ip/uart/data/uart.hjson"
 export VC_TOP_HJSON="${ROOTDIR}/hw/matcha/hw/top_matcha/ip/vc_top/data/vc_top.hjson"
diff --git a/platforms/sencha/setup.sh b/platforms/sencha/setup.sh
index f26b32b..b7b3f65 100644
--- a/platforms/sencha/setup.sh
+++ b/platforms/sencha/setup.sh
@@ -27,9 +27,9 @@
 # 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 I2S_HJSON="${ROOTDIR}/hw/matcha/hw/ip/i2s/data/i2s.hjson"
+export MBOX_HJSON="${ROOTDIR}/hw/matcha/hw/ip/tlul_mailbox/data/tlul_mailbox.hjson"
+export ML_TOP_HJSON="${ROOTDIR}/hw/matcha/hw/ip/ml_top/data/ml_top.hjson"
 export TIMER_HJSON="${OPENTITAN_GEN_DIR}/rv_timer.hjson"
 export UART_HJSON="${OPENTITAN_SOURCE}/hw/ip/uart/data/uart.hjson"
 export VC_TOP_HJSON="${ROOTDIR}/hw/matcha/hw/top_matcha/ip/vc_top/data/vc_top.hjson"
diff --git a/platforms/shodan/setup.sh b/platforms/shodan/setup.sh
index 1aa0c0d..ad43106 100644
--- a/platforms/shodan/setup.sh
+++ b/platforms/shodan/setup.sh
@@ -36,9 +36,9 @@
 # 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 I2S_HJSON="${ROOTDIR}/hw/matcha/hw/ip/i2s/data/i2s.hjson"
+export MBOX_HJSON="${ROOTDIR}/hw/matcha/hw/ip/tlul_mailbox/data/tlul_mailbox.hjson"
+export ML_TOP_HJSON="${ROOTDIR}/hw/matcha/hw/ip/ml_top/data/ml_top.hjson"
 export TIMER_HJSON="${OPENTITAN_GEN_DIR}/rv_timer.hjson"
 export UART_HJSON="${OPENTITAN_SOURCE}/hw/ip/uart/data/uart.hjson"
 export VC_TOP_HJSON="${ROOTDIR}/hw/matcha/hw/top_matcha/ip/vc_top/data/vc_top.hjson"
diff --git a/platforms/sparrow/setup.sh b/platforms/sparrow/setup.sh
index 93cbecd..79e19fe 100644
--- a/platforms/sparrow/setup.sh
+++ b/platforms/sparrow/setup.sh
@@ -36,9 +36,9 @@
 # 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 I2S_HJSON="${ROOTDIR}/hw/matcha/hw/ip/i2s/data/i2s.hjson"
+export MBOX_HJSON="${ROOTDIR}/hw/matcha/hw/ip/tlul_mailbox/data/tlul_mailbox.hjson"
+export ML_TOP_HJSON="${ROOTDIR}/hw/matcha/hw/ip/ml_top/data/ml_top.hjson"
 export TIMER_HJSON="${OPENTITAN_GEN_DIR}/rv_timer.hjson"
 export UART_HJSON="${OPENTITAN_SOURCE}/hw/ip/uart/data/uart.hjson"
 export VC_TOP_HJSON="${ROOTDIR}/hw/matcha/hw/top_matcha/ip/vc_top/data/vc_top.hjson"