4 files changed, 32 insertions, 19 deletions
diff --git a/src/mainboard/lippert/Kconfig b/src/mainboard/lippert/Kconfig
index 792a1430b7..3b9a2ff7f4 100644
--- a/src/mainboard/lippert/Kconfig
+++ b/src/mainboard/lippert/Kconfig
@@ -1,10 +1,23 @@
+if VENDOR_LIPPERT
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_LIPPERT
+
+config BOARD_LIPPERT_FRONTRUNNER
+	bool "Cool Frontrunner"
+config BOARD_LIPPERT_ROADRUNNER_LX
+	bool "Cool RoadRunner-LX"
+config BOARD_LIPPERT_SPACERUNNER_LX
+	bool "Cool SpaceRunner-LX"
+
+endchoice
 
 source "src/mainboard/lippert/frontrunner/Kconfig"
 source "src/mainboard/lippert/roadrunner-lx/Kconfig"
 source "src/mainboard/lippert/spacerunner-lx/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "Lippert"
 
+endif # VENDOR_LIPPERT
diff --git a/src/mainboard/lippert/frontrunner/Kconfig b/src/mainboard/lippert/frontrunner/Kconfig
index f9e555e453..adf2765c28 100644
--- a/src/mainboard/lippert/frontrunner/Kconfig
+++ b/src/mainboard/lippert/frontrunner/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_LIPPERT_FRONTRUNNER
-	bool "Cool Frontrunner"
+if BOARD_LIPPERT_FRONTRUNNER
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_GX2
 	select NORTHBRIDGE_AMD_GX2
@@ -12,15 +14,13 @@ config BOARD_LIPPERT_FRONTRUNNER
 config MAINBOARD_DIR
 	string
 	default lippert/frontrunner
-	depends on BOARD_LIPPERT_FRONTRUNNER
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Cool Frontrunner"
-	depends on BOARD_LIPPERT_FRONTRUNNER
 
 config IRQ_SLOT_COUNT
 	int
 	default 2
-	depends on BOARD_LIPPERT_FRONTRUNNER
 
+endif # BOARD_LIPPERT_FRONTRUNNER
diff --git a/src/mainboard/lippert/roadrunner-lx/Kconfig b/src/mainboard/lippert/roadrunner-lx/Kconfig
index 9f20930acd..6bc2e9a9d4 100644
--- a/src/mainboard/lippert/roadrunner-lx/Kconfig
+++ b/src/mainboard/lippert/roadrunner-lx/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_LIPPERT_ROADRUNNER_LX
-	bool "Cool RoadRunner-LX"
+if BOARD_LIPPERT_ROADRUNNER_LX
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
@@ -14,19 +16,17 @@ config BOARD_LIPPERT_ROADRUNNER_LX
 config MAINBOARD_DIR
 	string
 	default lippert/roadrunner-lx
-	depends on BOARD_LIPPERT_ROADRUNNER_LX
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Cool RoadRunner-LX"
-	depends on BOARD_LIPPERT_ROADRUNNER_LX
 
 config IRQ_SLOT_COUNT
 	int
 	default 7
-	depends on BOARD_LIPPERT_ROADRUNNER_LX
 
 config RAMBASE
 	hex
 	default 0x4000
-	depends on BOARD_LIPPERT_ROADRUNNER_LX
+
+endif # BOARD_LIPPERT_ROADRUNNER_LX
diff --git a/src/mainboard/lippert/spacerunner-lx/Kconfig b/src/mainboard/lippert/spacerunner-lx/Kconfig
index 700c04efbe..bef1899307 100644
--- a/src/mainboard/lippert/spacerunner-lx/Kconfig
+++ b/src/mainboard/lippert/spacerunner-lx/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_LIPPERT_SPACERUNNER_LX
-	bool "Cool SpaceRunner-LX"
+if BOARD_LIPPERT_SPACERUNNER_LX
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
@@ -15,19 +17,17 @@ config BOARD_LIPPERT_SPACERUNNER_LX
 config MAINBOARD_DIR
 	string
 	default lippert/spacerunner-lx
-	depends on BOARD_LIPPERT_SPACERUNNER_LX
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Cool SpaceRunner-LX"
-	depends on BOARD_LIPPERT_SPACERUNNER_LX
 
 config IRQ_SLOT_COUNT
 	int
 	default 7
-	depends on BOARD_LIPPERT_SPACERUNNER_LX
 
 config RAMBASE
 	hex
 	default 0x4000
-	depends on BOARD_LIPPERT_SPACERUNNER_LX
+
+endif # BOARD_LIPPERT_SPACERUNNER_LX