2 files changed, 16 insertions, 20 deletions

diff --git a/src/mainboard/sunw/Kconfig b/src/mainboard/sunw/Kconfig
index 8a42be7414..0ee7f2e8e3 100644
--- a/src/mainboard/sunw/Kconfig
+++ b/src/mainboard/sunw/Kconfig
@@ -1,8 +1,17 @@
+if VENDOR_SUNW
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_SUNW
 
-source "src/mainboard/sunw/ultra40/Kconfig"
+config BOARD_SUNW_ULTRA40
+	bool "Ultra 40"
 
 endchoice
 
+source "src/mainboard/sunw/ultra40/Kconfig"
+
+config MAINBOARD_VENDOR
+	string
+	default "Sun"
+
+endif # VENDOR_SUNW
diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig
index 937a8c8bc5..d806174d42 100644
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_SUNW_ULTRA40
-	bool "Ultra 40"
+if BOARD_SUNW_ULTRA40
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -17,80 +19,65 @@ config BOARD_SUNW_ULTRA40
 config MAINBOARD_DIR
 	string
 	default sunw/ultra40
-	depends on BOARD_SUNW_ULTRA40
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcf000
-	depends on BOARD_SUNW_ULTRA40
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_SUNW_ULTRA40
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_SUNW_ULTRA40
 
 config K8_REV_F_SUPPORT
 	bool
 	default n
-	depends on BOARD_SUNW_ULTRA40
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_SUNW_ULTRA40
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Ultra 40"
-	depends on BOARD_SUNW_ULTRA40
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_SUNW_ULTRA40
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_SUNW_ULTRA40
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_SUNW_ULTRA40
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_SUNW_ULTRA40
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_SUNW_ULTRA40
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_SUNW_ULTRA40
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_SUNW_ULTRA40
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x108e
-	depends on BOARD_SUNW_ULTRA40
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x40
-	depends on BOARD_SUNW_ULTRA40
 
+endif # BOARD_SUNW_ULTRA40