diff --git a/src/soc/amd/common/Kconfig.common b/src/soc/amd/common/Kconfig.common
index fa1d14a..8050881 100644
--- a/src/soc/amd/common/Kconfig.common
+++ b/src/soc/amd/common/Kconfig.common
@@ -10,4 +10,10 @@
 
 source "src/soc/amd/common/block/*/Kconfig"
 
+if PLATFORM_USES_FSP2_0
+
+source "src/soc/amd/common/fsp/*/Kconfig"
+
+endif # PLATFORM_USES_FSP2_0
+
 endif # SOC_AMD_COMMON
diff --git a/src/soc/amd/common/fsp/Makefile.inc b/src/soc/amd/common/fsp/Makefile.inc
index 3ba6ea5..ff25eba 100644
--- a/src/soc/amd/common/fsp/Makefile.inc
+++ b/src/soc/amd/common/fsp/Makefile.inc
@@ -2,4 +2,7 @@
 romstage-y += fsp_reset.c
 ramstage-y += fsp_reset.c
 ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fsp-acpi.c
+
+subdirs-y += ./*
+
 endif # CONFIG_PLATFORM_USES_FSP2_0