diff --git a/arch b/arch
index 184bd455fff..92eab5a12ba 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 184bd455fffac7989e63c5270154380ac91a37d0
+Subproject commit 92eab5a12badf6230d18b56c6027da6de442dc9a
diff --git a/configs b/configs
index 131b6f6c9f5..88faa8e05cc 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 131b6f6c9f5fc3c19b178fa21df9ad074884ed27
+Subproject commit 88faa8e05cc65a32d47e0b97c1954ef1e6e073df
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 0490b5d7817..da4bb5911e0 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -192,6 +192,8 @@ function configure {
     fi
 
     echo "  Refreshing..."
+    cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; }
+    make context 1>/dev/null 2>&1
     kconfig-conf --olddefconfig Kconfig 1>/dev/null
 }