diff --git a/src/soc/amd/Kconfig b/src/soc/amd/Kconfig
index 7c08f031b0..77eac6ba5a 100644
--- a/src/soc/amd/Kconfig
+++ b/src/soc/amd/Kconfig
@@ -1,6 +1,5 @@
 # Load all chipsets before common
-source "src/soc/amd/picasso/Kconfig"
-source "src/soc/amd/stoneyridge/Kconfig"
+source "src/soc/amd/*/Kconfig"
 
 # Load common defaults last
-source "src/soc/amd/common/Kconfig"
+source "src/soc/amd/common/Kconfig.common"
diff --git a/src/soc/amd/common/Kconfig b/src/soc/amd/common/Kconfig.common
similarity index 100%
rename from src/soc/amd/common/Kconfig
rename to src/soc/amd/common/Kconfig.common