diff --git a/src/soc/intel/Kconfig b/src/soc/intel/Kconfig
index 47efc4d18f..d5190683ae 100644
--- a/src/soc/intel/Kconfig
+++ b/src/soc/intel/Kconfig
@@ -1,18 +1,8 @@
 # Load all chipsets
-source "src/soc/intel/apollolake/Kconfig"
-source "src/soc/intel/baytrail/Kconfig"
-source "src/soc/intel/braswell/Kconfig"
-source "src/soc/intel/broadwell/Kconfig"
-source "src/soc/intel/cannonlake/Kconfig"
-source "src/soc/intel/denverton_ns/Kconfig"
-source "src/soc/intel/quark/Kconfig"
-source "src/soc/intel/skylake/Kconfig"
-source "src/soc/intel/icelake/Kconfig"
-source "src/soc/intel/tigerlake/Kconfig"
-source "src/soc/intel/xeon_sp/Kconfig"
+source "src/soc/intel/*/Kconfig"
 
 # Load common config
-source "src/soc/intel/common/Kconfig"
+source "src/soc/intel/common/Kconfig.common"
 
 config INTEL_HAS_TOP_SWAP
 	bool
diff --git a/src/soc/intel/common/Kconfig b/src/soc/intel/common/Kconfig.common
similarity index 100%
rename from src/soc/intel/common/Kconfig
rename to src/soc/intel/common/Kconfig.common