diff --git a/src/mainboard/samsung/Kconfig b/src/mainboard/samsung/Kconfig
index d6992d9..06e22d9 100644
--- a/src/mainboard/samsung/Kconfig
+++ b/src/mainboard/samsung/Kconfig
@@ -3,16 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_SAMSUNG_LUMPY
-	bool "Lumpy"
-
-config BOARD_SAMSUNG_STUMPY
-	bool "Stumpy"
+source "src/mainboard/samsung/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/samsung/lumpy/Kconfig"
-source "src/mainboard/samsung/stumpy/Kconfig"
+source "src/mainboard/samsung/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string