diff --git a/Kconfig b/Kconfig
index ce0bfa5b13d..03a2a872a50 100644
--- a/Kconfig
+++ b/Kconfig
@@ -165,7 +165,7 @@ config BUILD_PROTECTED
 
 config BUILD_KERNEL
 	bool "NuttX kernel build"
-	depends on ARCH_USE_MMU && ARCH_ADDRENV && EXPERIMENTAL
+	depends on ARCH_USE_MMU && ARCH_ADDRENV
 	select LIB_SYSCALL
 	---help---
 		Builds NuttX as a separately compiled kernel.  No applications are
diff --git a/arch b/arch
index d943c5e3049..f9a3a1463b2 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit d943c5e3049299c271d185701710166d7f20a4d4
+Subproject commit f9a3a1463b24b8da63f2a7577d0b4ce0131a1069
diff --git a/configs b/configs
index f27e7ff4e9d..196f9f3f3f0 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit f27e7ff4e9d21c92f272bd613d4d147b25b1a09e
+Subproject commit 196f9f3f3f067ccb3c285078a704a2a5eb37b7ea