3 files changed, 26 insertions, 13 deletions
diff --git a/src/mainboard/olpc/Kconfig b/src/mainboard/olpc/Kconfig
index a74f393774..c297f3295a 100644
--- a/src/mainboard/olpc/Kconfig
+++ b/src/mainboard/olpc/Kconfig
@@ -1,9 +1,20 @@
+if VENDOR_OLPC
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_OLPC
 
-source "src/mainboard/olpc/rev_a/Kconfig"
-source "src/mainboard/olpc/btest/Kconfig"
+config BOARD_OLPC_BTEST
+	bool "btest"
+config BOARD_OLPC_REV_A
+	bool "rev_a"
 
 endchoice
 
+source "src/mainboard/olpc/btest/Kconfig"
+source "src/mainboard/olpc/rev_a/Kconfig"
+
+config MAINBOARD_VENDOR
+	string
+	default "OLPC"
+
+endif # VENDOR_OLPC
diff --git a/src/mainboard/olpc/btest/Kconfig b/src/mainboard/olpc/btest/Kconfig
index 520d6097fb..009b9bebf2 100644
--- a/src/mainboard/olpc/btest/Kconfig
+++ b/src/mainboard/olpc/btest/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_OLPC_BTEST
-	bool "btest"
+if BOARD_OLPC_BTEST
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_GX2
 	select NORTHBRIDGE_AMD_GX2
@@ -12,14 +14,13 @@ config BOARD_OLPC_BTEST
 config MAINBOARD_DIR
 	string
 	default olpc/btest
-	depends on BOARD_OLPC_BTEST
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "btest"
-	depends on BOARD_OLPC_BTEST
 
 config IRQ_SLOT_COUNT
 	int
 	default 2
-	depends on BOARD_OLPC_BTEST
+
+endif # BOARD_OLPC_BTEST
diff --git a/src/mainboard/olpc/rev_a/Kconfig b/src/mainboard/olpc/rev_a/Kconfig
index c2b3911523..bae2692a6e 100644
--- a/src/mainboard/olpc/rev_a/Kconfig
+++ b/src/mainboard/olpc/rev_a/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_OLPC_REV_A
-	bool "rev_a"
+if BOARD_OLPC_REV_A
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_GX2
 	select NORTHBRIDGE_AMD_GX2
@@ -12,14 +14,13 @@ config BOARD_OLPC_REV_A
 config MAINBOARD_DIR
 	string
 	default olpc/rev_a
-	depends on BOARD_OLPC_REV_A
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "rev_a"
-	depends on BOARD_OLPC_REV_A
 
 config IRQ_SLOT_COUNT
 	int
 	default 2
-	depends on BOARD_OLPC_REV_A
+
+endif # BOARD_OLPC_REV_A