diff --git a/src/Kconfig b/src/Kconfig
index 02bf90ab86..2d24aad1ad 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -48,6 +48,6 @@ rsource "learning_gem5/part3/Kconfig"
 rsource "proto/Kconfig"
 rsource "dev/net/Kconfig"
 rsource "arch/Kconfig"
-rsource "cpu/kvm/Kconfig"
+rsource "cpu/Kconfig"
 rsource "systemc/Kconfig"
 rsource "gpu-compute/Kconfig"
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
new file mode 100644
index 0000000000..33a00e9c45
--- /dev/null
+++ b/src/cpu/Kconfig
@@ -0,0 +1,29 @@
+# Copyright 2023 Google LLC
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+config HAVE_CAPSTONE
+    def_bool $(HAVE_CAPSTONE)
+
+rsource "kvm/Kconfig"