2 files changed, 26 insertions, 19 deletions
diff --git a/src/mainboard/thomson/Kconfig b/src/mainboard/thomson/Kconfig
index eb2caa09ff..c1ba64f171 100644
--- a/src/mainboard/thomson/Kconfig
+++ b/src/mainboard/thomson/Kconfig
@@ -1,20 +1,17 @@
+if VENDOR_THOMSON
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_THOMSON
 
-source "src/mainboard/thomson/ip1000/Kconfig"
+config BOARD_THOMSON_IP1000
+	bool "IP1000"
 
 endchoice
 
-choice
-	prompt "IP1000 Onboard Memory"
-	default ONBOARD_MEMORY_64MB
-	depends on BOARD_THOMSON_IP1000
-
-config ONBOARD_MEMORY_64MB
-	bool "IP1000-64MB"
-config ONBOARD_MEMORY_128MB
-	bool "IP1000T-128MB"
+source "src/mainboard/thomson/ip1000/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "Thomson"
 
+endif # VENDOR_THOMSON
diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig
index 74f2214085..907ab9686c 100644
--- a/src/mainboard/thomson/ip1000/Kconfig
+++ b/src/mainboard/thomson/ip1000/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_THOMSON_IP1000
-	bool "IP1000"
+if BOARD_THOMSON_IP1000
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MFCBGA479
 	select NORTHBRIDGE_INTEL_I82830
@@ -18,24 +20,32 @@ config BOARD_THOMSON_IP1000
 config MAINBOARD_DIR
 	string
 	default thomson/ip1000
-	depends on BOARD_THOMSON_IP1000
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "IP1000"
-	depends on BOARD_THOMSON_IP1000
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xffdf8000
-	depends on BOARD_THOMSON_IP1000
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x8000
-	depends on BOARD_THOMSON_IP1000
 
 config IRQ_SLOT_COUNT
 	int
 	default 7
-	depends on BOARD_THOMSON_IP1000
+
+choice
+	prompt "IP1000 Onboard Memory"
+	default ONBOARD_MEMORY_64MB
+
+config ONBOARD_MEMORY_64MB
+	bool "IP1000-64MB"
+config ONBOARD_MEMORY_128MB
+	bool "IP1000T-128MB"
+
+endchoice
+
+endif # BOARD_THOMSON_IP1000