diff --git a/src/soc/amd/common/Kconfig.common b/src/soc/amd/common/Kconfig.common
index 6711843832..d6f9d01784 100644
--- a/src/soc/amd/common/Kconfig.common
+++ b/src/soc/amd/common/Kconfig.common
@@ -6,15 +6,7 @@ config SOC_AMD_COMMON
 if SOC_AMD_COMMON
 
 source "src/soc/amd/common/block/*/Kconfig"
+source "src/soc/amd/common/fsp/Kconfig"
 source "src/soc/amd/common/pi/Kconfig"
 
-if PLATFORM_USES_FSP2_0
-
-config SOC_AMD_COMMON_FSP_DMI_TABLES
-	bool
-
-source "src/soc/amd/common/fsp/*/Kconfig"
-
-endif # PLATFORM_USES_FSP2_0
-
 endif # SOC_AMD_COMMON
diff --git a/src/soc/amd/common/fsp/Kconfig b/src/soc/amd/common/fsp/Kconfig
new file mode 100644
index 0000000000..81fe29809a
--- /dev/null
+++ b/src/soc/amd/common/fsp/Kconfig
@@ -0,0 +1,8 @@
+if PLATFORM_USES_FSP2_0
+
+config SOC_AMD_COMMON_FSP_DMI_TABLES
+	bool
+
+source "src/soc/amd/common/fsp/*/Kconfig"
+
+endif # PLATFORM_USES_FSP2_0