diff --git a/generators/testchipip b/generators/testchipip
index 0945fe6498..c298a28148 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit 0945fe6498bc3369c98c2b98c827acb31ab7de40
+Subproject commit c298a2814816d85a29c48e7a5d85b810bdcb2b2b
diff --git a/toolchains/riscv-tools/riscv-isa-sim b/toolchains/riscv-tools/riscv-isa-sim
index ce42f1b55a..0eec0c9119 160000
--- a/toolchains/riscv-tools/riscv-isa-sim
+++ b/toolchains/riscv-tools/riscv-isa-sim
@@ -1 +1 @@
-Subproject commit ce42f1b55a3fa5a3a522439b5370be2256f68862
+Subproject commit 0eec0c911933ccc722d4b4479a6c4b8ac68f2f52